summaryrefslogtreecommitdiff
path: root/Documentation/gittutorial-2.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-10-19 16:06:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-19 16:06:31 -0700
commitedacb101ef831cdc59d07015b1b5cd1aaddcc588 (patch)
treee03312e706ad3a285c19772189c48528b7ef3c2a /Documentation/gittutorial-2.txt
parentMerge branch 'mv/merge-noff' (diff)
parentrebase: Support preserving merges in non-interactive mode (diff)
downloadtgif-edacb101ef831cdc59d07015b1b5cd1aaddcc588.tar.xz
Merge branch 'ae/preservemerge'
* ae/preservemerge: rebase: Support preserving merges in non-interactive mode
Diffstat (limited to 'Documentation/gittutorial-2.txt')
0 files changed, 0 insertions, 0 deletions