···

       
62
       
62
       
 
       
# Other {{{

     

       
63
       
63
       
 
       
.rake_tasks

     

       
64
       
64
       
 
       
.meteor/

     

       
65
       
65
       
-
       
tags

     

       
66
       
66
       
-
       
tags.*

     

       
67
       
65
       
 
       
.gdb_history

     

       
68
       
66
       
 
       
perf.data*

     

       
69
       
67
       
 
       
oprofile_data

     

···

       
6
       
6
       
 
       
      user.email = "~@hauleth.dev";

     

       
7
       
7
       
 
       
      user.name = "Łukasz Niemier";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
-
       
      ui.default-command = ["log" "--template=log_compact"];

     

       
9
       
9
       
+
       
      ui = {

     

       
10
       
10
       
+
       
        default-command = ["log" "--template=log_compact"];

     

       
11
       
11
       
+
       


     

       
12
       
12
       
+
       
        conflict-marker-style = "diff3";

     

       
13
       
13
       
+
       
      };

     

       
10
       
14
       
 
       


     

       
11
       
15
       
 
       
      aliases = {

     

       
12
       
16
       
 
       
        record = ["commit"];

     
···

       
66
       
70
       
 
       
                    if(conflict, label("conflict", "conflict")),

     

       
67
       
71
       
 
       
                    if(config("ui.show-cryptographic-signatures").as_boolean(),

     

       
68
       
72
       
 
       
                      format_short_cryptographic_signature(signature)),

     

       
73
       
73
       
+
       
                    if(!description && !empty, "\n" ++ diff.summary()),

     

       
69
       
74
       
 
       
                  ) ++ "\n",

     

       
70
       
75
       
 
       
                ),

     

       
71
       
76
       
 
       
              )