Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/diff-irreversible-delete' | Junio C Hamano | 2011-04-28 |
|\ | |||
| * | git diff -D: omit the preimage of deletes | Junio C Hamano | 2011-04-02 |
* | | Merge branch 'jc/rename-degrade-cc-to-c' | Junio C Hamano | 2011-04-28 |
|\ \ | |||
| * | | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 |
* | | | Merge branch 'mz/rebase' | Junio C Hamano | 2011-04-28 |
|\ \ \ | |||
| * | | | rebase: use @{upstream} if no upstream specified | Martin von Zweigbergk | 2011-02-10 |
| * | | | rebase -m: remember allow_rerere_autoupdate option | Martin von Zweigbergk | 2011-02-10 |
| * | | | rebase: remember strategy and strategy options | Martin von Zweigbergk | 2011-02-10 |
| * | | | rebase: stricter check of standalone sub command | Martin von Zweigbergk | 2011-02-10 |
* | | | | Merge branch 'en/merge-recursive' | Junio C Hamano | 2011-04-28 |
|\ \ \ \ | |||
| * | | | | merge-recursive: When we detect we can skip an update, actually skip it | Elijah Newren | 2011-03-02 |
| * | | | | t6022: New test checking for unnecessary updates of files in D/F conflicts | Elijah Newren | 2011-03-02 |
| * | | | | t6022: New test checking for unnecessary updates of renamed+modified files | Elijah Newren | 2011-03-02 |
* | | | | | Merge branch 'jh/dirstat' | Junio C Hamano | 2011-04-28 |
|\ \ \ \ \ | |||
| * | | | | | Teach --dirstat not to completely ignore rearranged lines within a file | Johan Herland | 2011-04-11 |
| * | | | | | --dirstat-by-file: Make it faster and more correct | Johan Herland | 2011-04-11 |
| * | | | | | --dirstat: Describe non-obvious differences relative to --stat or regular diff | Johan Herland | 2011-04-11 |
* | | | | | | Merge branch 'mg/x-years-12-months' | Junio C Hamano | 2011-04-27 |
|\ \ \ \ \ \ | |||
| * | | | | | | date: avoid "X years, 12 months" in relative dates | Michael J Gruber | 2011-04-20 |
* | | | | | | | Merge branch 'ef/maint-strbuf-init' | Junio C Hamano | 2011-04-27 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | config: support values longer than 1023 bytes | Erik Faye-Lund | 2011-04-11 |
* | | | | | | | | Merge branch 'dm/stash-k-i-p' | Junio C Hamano | 2011-04-27 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | stash: ensure --no-keep-index and --patch can be used in any order | Dan McGee | 2011-04-07 |
| * | | | | | | | | stash: add two more tests for --no-keep-index | Dan McGee | 2011-04-07 |
* | | | | | | | | | Merge branch 'jk/maint-stash-oob' | Junio C Hamano | 2011-04-27 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | stash: fix false positive in the invalid ref test. | Jon Seymour | 2011-04-05 |
| * | | | | | | | | | stash: fix accidental apply of non-existent stashes | Jeff King | 2011-04-05 |
* | | | | | | | | | | Merge branch 'jk/stash-loosen-safety' | Junio C Hamano | 2011-04-27 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | stash: drop dirty worktree check on apply | Jeff King | 2011-04-06 |
| | |/ / / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'mh/git-svn-automkdirs' | Junio C Hamano | 2011-04-27 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | git-svn: add an option to skip the creation of empty directories | Michael Haggerty | 2011-04-01 |
* | | | | | | | | | | | Merge branch 'mg/reflog-with-options' | Junio C Hamano | 2011-04-27 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | reflog: fix overriding of command line options | Michael J Gruber | 2011-04-01 |
| * | | | | | | | | | | | t/t1411: test reflog with formats | Michael J Gruber | 2011-04-01 |
* | | | | | | | | | | | | Merge branch 'ar/clean-rmdir-empty' | Junio C Hamano | 2011-04-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | clean: unreadable directory may still be rmdir-able if it is empty | Alex Riesen | 2011-04-01 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'mg/sha1-path-advise' | Junio C Hamano | 2011-04-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | sha1_name: Suggest commit:./file for path in subdir | Michael J Gruber | 2011-04-03 |
| * | | | | | | | | | | | | t1506: factor out test for "Did you mean..." | Michael J Gruber | 2011-04-03 |
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-04-14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | t3306,t5304: avoid clock skew issues | Michael J Gruber | 2011-04-14 |
| * | | | | | | | | | | | | | Merge branch 'js/checkout-untracked-symlink' into maint | Junio C Hamano | 2011-04-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Merge branch 'nm/maint-conflicted-submodule-entries' into maint | Junio C Hamano | 2011-04-06 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | pull: do not clobber untracked files on initial pull | Jeff King | 2011-04-03 |
| * | | | | | | | | | | | | | | Merge branch 'jc/maint-rev-list-culled-boundary' into maint | Junio C Hamano | 2011-04-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint | Junio C Hamano | 2011-04-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/format-patch-multiline-header' into maint | Junio C Hamano | 2011-04-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lp/config-vername-check' into maint | Junio C Hamano | 2011-04-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | Merge branch 'pk/stash-apply-status-relative' into maint | Junio C Hamano | 2011-04-01 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-diff-q-filter' into maint | Junio C Hamano | 2011-04-01 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |