diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-26 21:36:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-26 21:36:10 (GMT) |
| commit | 1ef9e05dbf36a80bb65fb150dd7bdd60852db777 (patch) | |
| tree | 319b38fbc0efc75d216bacccbeb53cc3ed42e50f /Documentation | |
| parent | 6a0dbb8a5c41770c2280de15c3202970c6515ccc (diff) | |
| parent | 7d0c68871a86df0654454df047458836afa13129 (diff) | |
| download | git-1ef9e05dbf36a80bb65fb150dd7bdd60852db777.zip git-1ef9e05dbf36a80bb65fb150dd7bdd60852db777.tar.gz git-1ef9e05dbf36a80bb65fb150dd7bdd60852db777.tar.bz2 | |
Merge branch 'jc/squash'
* jc/squash:
git-merge --squash
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 53cc355..182cef5 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -6,6 +6,14 @@ not autocommit, to give the user a chance to inspect and further tweak the merge result before committing. +--squash:: + Produce the working tree and index state as if a real + merge happened, but do not actually make a commit or + move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to + cause the next `git commit` command to create a merge + commit. This allows you to create a single commit on + top of the current branch whose effect is the same as + merging another branch (or more in case of an octopus). -s <strategy>, \--strategy=<strategy>:: Use the given merge strategy; can be supplied more than |