global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-24 23:50:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'sg/merge-options^' into jk/renamelimit

Browse Source 
* commit 'sg/merge-options^':
  merge, pull: add '--(no-)log' command line option
  fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
  add 'merge.stat' config variable
  merge, pull: introduce '--(no-)stat' option
  doc: moved merge.* config variables into separate merge-config.txt
This commit is contained in:
Junio C Hamano
2008-05-03 13:18:20 -07:00
parent e4b9c36ca4 efb779f887
commit ec845695c4
11 changed files with 186 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/git-completion.bash
View File

@@ -780,7 +780,7 @@ _git_merge ()
;;
--*)
__gitcomp "
--no-commit --no-summary --squash --strategy
--no-commit --no-stat --log --no-log --squash --strategy
"
return
esac