| Commit message (Expand) | Author | Age | Files | Lines |
* | git-merge: exclude unnecessary options from OPTIONS_SPEC | Miklos Vajna | 2008-05-21 | 1 | -3/+1 |
* | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 2008-04-12 | 1 | -2/+6 |
* | add 'merge.stat' config variable | SZEDER Gábor | 2008-04-12 | 1 | -0/+1 |
* | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 | 1 | -4/+6 |
* | specify explicit "--pretty=medium" with `git log/show/whatchanged` | Denis Cheng | 2008-03-05 | 1 | -1/+1 |
* | git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options | Gerrit Pape | 2008-03-03 | 1 | -6/+11 |
* | Merge branch 'ph/parseopt-sh' | Junio C Hamano | 2007-11-17 | 1 | -72/+54 |
|\ |
|
| * | Migrate git-merge.sh to use git-rev-parse --parseopt | Pierre Habouzit | 2007-11-05 | 1 | -72/+54 |
* | | Merge branch 'jc/stash-create' | Junio C Hamano | 2007-11-14 | 1 | -6/+5 |
|\ \
| |/
|/| |
|
| * | git-merge: no reason to use cpio anymore | Junio C Hamano | 2007-11-01 | 1 | -6/+5 |
* | | Merge branch 'lh/merge' | Junio C Hamano | 2007-10-03 | 1 | -11/+54 |
|\ \ |
|
| * | | git-merge: add --ff and --no-ff options | Lars Hjemli | 2007-09-23 | 1 | -6/+16 |
| * | | git-merge: add support for --commit and --no-squash | Lars Hjemli | 2007-09-23 | 1 | -2/+6 |
| * | | git-merge: add support for branch.<name>.mergeoptions | Lars Hjemli | 2007-09-23 | 1 | -0/+21 |
| * | | git-merge: refactor option parsing | Lars Hjemli | 2007-09-23 | 1 | -6/+14 |
| * | | git-merge: fix faulty SQUASH_MSG | Lars Hjemli | 2007-09-23 | 1 | -1/+1 |
* | | | Merge branch 'jc/autogc' | Junio C Hamano | 2007-10-03 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | Invoke "git gc --auto" from commit, merge, am and rebase. | Junio C Hamano | 2007-09-06 | 1 | -0/+1 |
| | |/
| |/| |
|
* | | | Merge branch 'je/hooks' | Junio C Hamano | 2007-09-23 | 1 | -0/+13 |
|\ \ \
| |_|/
|/| | |
|
| * | | Add post-merge hook, related documentation, and tests. | Josh England | 2007-09-18 | 1 | -0/+13 |
| |/ |
|
* | | Supplant the "while case ... break ;; esac" idiom | David Kastrup | 2007-09-23 | 1 | -1/+1 |
|/ |
|
* | git-merge: do up-to-date check also for all strategies | Junio C Hamano | 2007-08-27 | 1 | -15/+20 |
* | Enable "git rerere" by the config variable rerere.enabled | Johannes Schindelin | 2007-07-06 | 1 | -4/+1 |
* | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 | 1 | -36/+36 |
* | Merge branch 'ar/mergestat' | Junio C Hamano | 2007-05-29 | 1 | -6/+12 |
|\ |
|
| * | Add a configuration option to control diffstat after merge | Alex Riesen | 2007-05-24 | 1 | -6/+12 |
* | | Merge branch 'maint' | Junio C Hamano | 2007-05-26 | 1 | -3/+3 |
|\ \
| |/
|/| |
|
| * | Merge branch 'maint-1.5.1' into maint | Junio C Hamano | 2007-05-26 | 1 | -3/+3 |
| |\ |
|
| | * | More echo "$user_message" fixes. | Jeff King | 2007-05-26 | 1 | -3/+3 |
* | | | Add colour support in rebase and merge tree diff stats output. | James Bowes | 2007-05-10 | 1 | -1/+2 |
|/ / |
|
* | | A new merge stragety 'subtree'. | Junio C Hamano | 2007-04-07 | 1 | -2/+2 |
|/ |
|
* | git-merge: Put FETCH_HEAD data in merge commit message | Michael S. Tsirkin | 2007-03-22 | 1 | -0/+4 |
* | git-merge: finish when git-read-tree fails | Santi Béjar | 2007-03-16 | 1 | -2/+2 |
* | git-merge: warn when -m provided on a fast forward | J. Bruce Fields | 2007-03-11 | 1 | -1/+6 |
* | git-merge: fail correctly when we cannot fast forward. | Junio C Hamano | 2007-03-03 | 1 | -1/+1 |
* | git-merge: minor fix for no_trivial_merge_strategies. | Junio C Hamano | 2007-02-16 | 1 | -6/+9 |
* | [PATCH] Rename git-repo-config to git-config. | Tom Prince | 2007-01-28 | 1 | -2/+2 |
* | git-merge: leave sensible reflog message when used as the first level UI. | Junio C Hamano | 2007-01-26 | 1 | -1/+1 |
* | Merge branch 'sp/merge' (early part) | Junio C Hamano | 2007-01-14 | 1 | -17/+23 |
|\ |
|
| * | Improve merge performance by avoiding in-index merges. | Shawn O. Pearce | 2007-01-10 | 1 | -17/+23 |
* | | Allow whole-tree operations to be started from a subdirectory | Junio C Hamano | 2007-01-12 | 1 | -1/+3 |
* | | Disallow working directory commands in a bare repository. | Shawn O. Pearce | 2007-01-10 | 1 | -0/+1 |
|/ |
|
* | fail pull/merge early in the middle of conflicted merge | Junio C Hamano | 2007-01-01 | 1 | -0/+3 |
* | Honor pull.{twohead,octopus} in git-merge. | Shawn O. Pearce | 2006-12-28 | 1 | -2/+14 |
* | Use GIT_REFLOG_ACTION environment variable instead. | Shawn O. Pearce | 2006-12-28 | 1 | -8/+5 |
* | Display 'theirs' branch name when possible in merge. | Shawn O. Pearce | 2006-12-23 | 1 | -0/+2 |
* | merge and reset: adjust for "reset --hard" messages | Junio C Hamano | 2006-12-22 | 1 | -1/+1 |
* | merge: give a bit prettier merge message to "merge branch~$n" | Junio C Hamano | 2006-12-16 | 1 | -9/+17 |
* | Merge branch 'jc/read-tree-ignore' | Junio C Hamano | 2006-12-13 | 1 | -1/+1 |
|\ |
|
| * | Loosen "working file will be lost" check in Porcelain-ish | Junio C Hamano | 2006-12-05 | 1 | -1/+1 |