mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge, pull: add '--(no-)log' command line option

Browse Source 
These are the command line option equivalents of the 'merge.log' config
variable.

The patch also updates documentation and bash completion accordingly, and
adds a test.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor
2008-04-06 03:23:46 +02:00
committed by Junio C Hamano
parent 6cd9cfefc5
commit efb779f887
5 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/merge-options.txt
View File

@ -9,6 +9,15 @@
Synonyms to --stat and --no-stat; these are deprecated and will be
removed in the future.
--log::
In addition to branch names, populate the log message with
one-line descriptions from the actual commits that are being
merged.
--no-log::
Do not list one-line descriptions from the actual commits being
merged.
--no-commit::
Perform the merge but pretend the merge failed and do
not autocommit, to give the user a chance to inspect and