summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2019-03-14 19:12:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-18 01:24:56 (GMT)
commitaba4954cb05fa60bc00ada3bdfcbe6d72d9b8380 (patch)
treee3a6495c9fc4df2ee6775e09b175082d288b629e /Documentation/git-merge.txt
parente902e9bcae2010bc42648c80ab6adc6c5a16a4a5 (diff)
downloadgit-aba4954cb05fa60bc00ada3bdfcbe6d72d9b8380.zip
git-aba4954cb05fa60bc00ada3bdfcbe6d72d9b8380.tar.gz
git-aba4954cb05fa60bc00ada3bdfcbe6d72d9b8380.tar.bz2
am/cherry-pick/rebase/revert: document --rerere-autoupdate
This option was missing from the man pages of these commands. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions