summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-02-16 14:32:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-16 14:32:59 -0800
commitda656f17d37fe96454645c08f21a24134f5aa900 (patch)
tree4fb50c4122a0e00a9fd2baac4849d0249b818113 /mergetools
parentrebase -i: clarify in-editor documentation of "exec" (diff)
parentMerge branch 'maint-1.7.1' into maint-1.7.2 (diff)
downloadtgif-da656f17d37fe96454645c08f21a24134f5aa900.tar.xz
Merge branch 'maint-1.7.2' into maint-1.7.3
* maint-1.7.2: fast-import: introduce "feature notes" command fast-import: clarify documentation of "feature" command
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions