summaryrefslogtreecommitdiff
path: root/editor.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-11-17 13:18:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-17 13:18:19 -0800
commit5d268edff8a271fe68f525e8d382a13b96c71a81 (patch)
tree58a610f4a1bed6d647c824617d6a95236f99999d /editor.c
parentDocumentation/git-pull: clarify configuration (diff)
parentt3402: test "rebase -s<strategy> -X<opt>" (diff)
downloadtgif-5d268edff8a271fe68f525e8d382a13b96c71a81.tar.xz
Merge branch 'mz/maint-rebase-X-fix' into maint
* mz/maint-rebase-X-fix: t3402: test "rebase -s<strategy> -X<opt>"
Diffstat (limited to 'editor.c')
0 files changed, 0 insertions, 0 deletions