summaryrefslogtreecommitdiff
path: root/contrib/subtree/git-subtree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 10:41:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-03 10:41:32 -0700
commitc36e465aca712cea70cb9570a1e7136e5de36b76 (patch)
treea80105535c9ea72b73b58574728fdc8cbeecf26a /contrib/subtree/git-subtree.txt
parentMerge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint (diff)
parentam --abort: keep unrelated commits on unborn branch (diff)
downloadtgif-c36e465aca712cea70cb9570a1e7136e5de36b76.tar.xz
Merge branch 'pt/am-abort-fix' into maint
Various fixes around "git am" that applies a patch to a history that is not there yet. * pt/am-abort-fix: am --abort: keep unrelated commits on unborn branch am --abort: support aborting to unborn branch am --abort: revert changes introduced by failed 3way merge am --skip: support skipping while on unborn branch am -3: support 3way merge on unborn branch am --skip: revert changes introduced by failed 3way merge
Diffstat (limited to 'contrib/subtree/git-subtree.txt')
0 files changed, 0 insertions, 0 deletions