diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-20 01:06:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-21 20:55:40 -0800 |
| commit | 17bcdad3b7baa3b12c662663372f1e3cd560dd8e (patch) | |
| tree | a5ce72aeec79df021d5b57163c44cdde69a329f6 /builtin-show-branch.c | |
| parent | 7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (diff) | |
| download | git-17bcdad3b7baa3b12c662663372f1e3cd560dd8e.tar.gz | |
git-merge: make it usable as the first class UI
This teaches the oft-requested syntax
git merge $commit
to implement merging the named commit to the current branch.
This hopefully would make "git merge" usable as the first class
UI instead of being a mere backend for "git pull".
Most notably, $commit above can be any committish, so you can
say for example:
git merge js/shortlog~2
to merge early part of a topic branch without merging the rest
of it.
A custom merge message can be given with the new --message=<msg>
parameter. The message is prepended in front of the usual
"Merge ..." message autogenerated with fmt-merge-message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-show-branch.c')
0 files changed, 0 insertions, 0 deletions