summaryrefslogtreecommitdiff
path: root/t/t9502-gitweb-standalone-parse-output.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-05-08 22:34:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-08 22:34:47 -0700
commitf78eeeaf55a4f60a05d3e6452f29a2214c29b6fd (patch)
tree24d7d6f25b0bdf61cc6bd50a81b1e5500bb89265 /t/t9502-gitweb-standalone-parse-output.sh
parentMerge branch 'sc/http-late-auth' (diff)
parentrevert: add "--strategy" option to choose merge strategy (diff)
downloadtgif-f78eeeaf55a4f60a05d3e6452f29a2214c29b6fd.tar.xz
Merge branch 'cc/revert-strategy'
* cc/revert-strategy: revert: add "--strategy" option to choose merge strategy merge: make function try_merge_command non static merge: refactor code that calls "git merge-STRATEGY" revert: refactor merge recursive code into its own function revert: use strbuf to refactor the code that writes the merge message Conflicts: builtin/revert.c
Diffstat (limited to 't/t9502-gitweb-standalone-parse-output.sh')
0 files changed, 0 insertions, 0 deletions