Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4 | Junio C Hamano | 2011-05-26 |
|\ | |||
| * | test core.gitproxy configuration | Jeff King | 2011-05-18 |
* | | 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 |
|\ \ | |||
| * | | t2021: mark a test as fixed | Johannes Sixt | 2011-04-12 |
* | | | Merge branch 'nm/maint-conflicted-submodule-entries' into maint | Junio C Hamano | 2011-04-06 |
|\ \ \ | |||
| * | | | submodule: process conflicting submodules only once | Nicolas Morey-Chaisemartin | 2011-03-30 |
* | | | | 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 |
|\ \ \ \ | |||
| * | | | | list-objects.c: don't add an unparsed NULL as a pending tree | Junio C Hamano | 2011-03-14 |
* | | | | | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint | Junio C Hamano | 2011-04-03 |
|\ \ \ \ \ | |||
| * | | | | | log: fix --max-count when used together with -S or -G | Matthieu Moy | 2011-03-09 |
* | | | | | | Merge branch 'jk/format-patch-multiline-header' into maint | Junio C Hamano | 2011-04-03 |
|\ \ \ \ \ \ | |||
| * | | | | | | format-patch: wrap long header lines | Jeff King | 2011-02-23 |
* | | | | | | | Merge branch 'lp/config-vername-check' into maint | Junio C Hamano | 2011-04-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Disallow empty section and variable names | Libor Pechacek | 2011-02-22 |
| * | | | | | | | Sanity-check config variable names | Libor Pechacek | 2011-02-22 |
* | | | | | | | | Merge branch 'pk/stash-apply-status-relative' into maint | Junio C Hamano | 2011-04-01 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Add test: git stash shows status relative to current dir | Piotr Krukowiecki | 2011-03-20 |
* | | | | | | | | | Merge branch 'jc/maint-diff-q-filter' into maint | Junio C Hamano | 2011-04-01 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | diff --quiet: disable optimization when --diff-filter=X is used | Junio C Hamano | 2011-03-16 |
* | | | | | | | | | | Merge branch 'jh/maint-do-not-track-non-branches' into maint | Junio C Hamano | 2011-04-01 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | branch/checkout --track: Ensure that upstream branch is indeed a branch | Johan Herland | 2011-02-16 |
* | | | | | | | | | | | Merge branch 'js/checkout-untracked-symlink' into maint | Junio C Hamano | 2011-04-01 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
| * | | | | | | | | | | do not overwrite untracked symlinks | Clemens Buchacher | 2011-02-21 |
| * | | | | | | | | | | Demonstrate breakage: checkout overwrites untracked symlink with directory | Johannes Sixt | 2011-02-15 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge "checkout ambiguous ref bugfix" into maint | Junio C Hamano | 2011-04-01 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||
| * | | | | | | | | | checkout: fix bug with ambiguous refs | Junio C Hamano | 2011-01-11 |
* | | | | | | | | | | t8001: check the exit status of the command being tested | Junio C Hamano | 2011-03-30 |
* | | | | | | | | | | Typos: t/README | Michael Witten | 2011-03-30 |
* | | | | | | | | | | HOME must be set before calling git-init when creating test repositories | Alex Riesen | 2011-03-29 |
* | | | | | | | | | | Merge branch 'so/submodule-no-update-first-time' into maint | Junio C Hamano | 2011-03-20 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t7406: "git submodule update {--merge|--rebase]" with new submodules | Spencer E. Olson | 2011-02-17 |
| | |/ / / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'mo/perl-bidi-pipe-envfix' into maint | Junio C Hamano | 2011-03-20 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | perl: command_bidi_pipe() method should set-up git environmens | Masatake Osanai | 2011-02-14 |
* | | | | | | | | | | | Merge branch 'ae/better-template-failure-report' into maint | Junio C Hamano | 2011-03-20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Improve error messages when temporary file creation fails | Arnout Engelen | 2010-12-21 |
* | | | | | | | | | | | | Work around broken ln on solaris as used in t8006 | Ben Walton | 2011-03-20 |
* | | | | | | | | | | | | t/README: Add a note about running commands under valgrind | Carlos MartÃn Nieto | 2011-03-20 |
* | | | | | | | | | | | | Merge branch 'jn/maint-commit-missing-template' into maint | Junio C Hamano | 2011-03-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | commit: error out for missing commit message template | Jonathan Nieder | 2011-02-25 |
| * | | | | | | | | | | | | Merge branch 'maint-1.7.2' into maint-1.7.3 | Junio C Hamano | 2011-02-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.1' into maint-1.7.2 | Junio C Hamano | 2011-02-16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.0' into maint-1.7.1 | Junio C Hamano | 2011-02-16 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
* | | | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lt/rename-no-extra-copy-detection' into maint | Junio C Hamano | 2011-03-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | diffcore-rename: properly honor the difference between -M and -C | Linus Torvalds | 2011-02-18 |
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Merge branch 'jk/diffstat-binary' into maint | Junio C Hamano | 2011-03-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | diff: handle diffstat of rewritten binary files | Jeff King | 2011-02-22 |
* | | | | | | | | | | | | | | | | | Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maint | Junio C Hamano | 2011-03-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | tests: skip terminal output tests on OS X | Jonathan Nieder | 2011-02-17 |