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