summaryrefslogtreecommitdiff
path: root/t/t3403-rebase-skip.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 10:49:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 10:49:26 -0700
commitd25a265220f7e9a50693d0ec4bb05c7be0539d69 (patch)
tree34bf878cbc1181b0614ad7ba210d48f0ad550fa3 /t/t3403-rebase-skip.sh
parentMerge branch 'jc/apply-blank-at-eof-fix' into maint (diff)
parentAccept tags in HEAD or MERGE_HEAD (diff)
downloadtgif-d25a265220f7e9a50693d0ec4bb05c7be0539d69.tar.xz
Merge branch 'nd/maint-autofix-tag-in-head' into maint
* nd/maint-autofix-tag-in-head: Accept tags in HEAD or MERGE_HEAD merge: remove global variable head[] merge: use return value of resolve_ref() to determine if HEAD is invalid merge: keep stash[] a local variable Conflicts: builtin/merge.c
Diffstat (limited to 't/t3403-rebase-skip.sh')
0 files changed, 0 insertions, 0 deletions