summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-02 12:14:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-02 12:14:37 -0700
commit5ab2f7b2ce8c51e8c47a4cc57c30fa7cae239005 (patch)
tree1888b316163a5c96efc874a3d8f40b219a2af0e0 /Documentation/user-manual.txt
parentMerge branch 'js/maint-diff-temp-smudge' into maint (diff)
parentblame: read custom grafts given by -S before calling setup_revisions() (diff)
downloadtgif-5ab2f7b2ce8c51e8c47a4cc57c30fa7cae239005.tar.xz
Merge branch 'jc/maint-1.6.0-blame-s' into maint
* jc/maint-1.6.0-blame-s: blame: read custom grafts given by -S before calling setup_revisions() Conflicts: builtin-blame.c
Diffstat (limited to 'Documentation/user-manual.txt')
0 files changed, 0 insertions, 0 deletions