屑俺日記

☆ tig

git のワークショップ中に教えてもらったコマンド。
apt-get ですぐインストールできた。

2016-02-20 16:05 $USER M─┐ [master] merging conflict branch                    
2016-02-20 15:56 $USER │ o [conflict] add a line to conflict                   
2016-02-20 15:58 $USER o │ [confilct] add a new line to confilct with conflict 
2016-02-20 15:37 $USER o─┘ [newbranch] changed first.txt in new branch only    
2016-02-20 15:34 $USER o new branch only third.txt                             
2016-02-20 15:08 $USER o add fault message                                     
2016-02-20 15:01 $USER o Revert "remove second.txt"                            
[main] bc29c3c0ff4ea838a607e1c2e665e4495f9ef4ce - commit 7 of 12             58%
commit bc29c3c0ff4ea838a607e1c2e665e4495f9ef4ce                                 
Author:     $USER <$MAIL_ADDR>                                         
AuthorDate: Sat Feb 20 15:01:39 2016 +0900                                      
Commit:     $USER <$MAIL_ADDR>                                         
CommitDate: Sat Feb 20 15:01:39 2016 +0900                                      
 
    Revert "remove second.txt"
 
    This reverts commit 1914a008d59f4198cbd0a402e3e7481576b178f7.
---                                                                             
 second.txt | 1 +                                                               
 1 file changed, 1 insertion(+)
 
[diff] bc29c3c0ff4ea838a607e1c2e665e4495f9ef4ce - line 1 of 20               65%

ncursesの色合いを<span style=>でやろうかと思ったが、 流石に手書きでやる気になれず。