Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mm/maint-log-n-with-diff-filtering' | Junio C Hamano | 2011-03-19 | 4 | -0/+19 |
|\ | |||||
| * | log: fix --max-count when used together with -S or -G | Matthieu Moy | 2011-03-09 | 4 | -0/+19 |
* | | Merge branch 'ab/i18n-basic' | Junio C Hamano | 2011-03-19 | 1 | -0/+9 |
|\ \ | |||||
| * | | i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set | Jonathan Nieder | 2011-03-08 | 1 | -1/+7 |
| * | | i18n: add GETTEXT_POISON to simulate unfriendly translator | Ævar Arnfjörð Bjarmason | 2011-03-08 | 1 | -0/+3 |
* | | | Merge branch 'jk/trace-sifter' | Junio C Hamano | 2011-03-19 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | trace: give repo_setup trace its own key | Jeff King | 2011-03-08 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'jk/format-patch-multiline-header' | Junio C Hamano | 2011-03-19 | 1 | -0/+84 |
|\ \ \ | |||||
| * | | | format-patch: wrap long header lines | Jeff King | 2011-02-23 | 1 | -0/+84 |
* | | | | grep: read patterns from stdin with -f - | René Scharfe | 2011-03-19 | 1 | -0/+5 |
* | | | | Name make_*_path functions more accurately | Carlos Martín Nieto | 2011-03-17 | 1 | -5/+5 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-16 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'jn/maint-commit-missing-template' into maint | Junio C Hamano | 2011-03-16 | 1 | -3/+11 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'lt/rename-no-extra-copy-detection' into maint | Junio C Hamano | 2011-03-16 | 5 | -6/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/diffstat-binary' into maint | Junio C Hamano | 2011-03-16 | 1 | -0/+7 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maint | Junio C Hamano | 2011-03-16 | 1 | -3/+19 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/fail-null-clone' into maint | Junio C Hamano | 2011-03-16 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'mg/placeholders-are-lowercase' into maint | Junio C Hamano | 2011-03-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mg/patch-id' into maint | Junio C Hamano | 2011-03-16 | 1 | -0/+36 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint | Junio C Hamano | 2011-03-16 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | valgrind: ignore SSE-based strlen invalid reads | Carlos Martín Nieto | 2011-03-16 | 1 | -0/+6 |
* | | | | | | | | | | | | | Merge branch 'jh/maint-do-not-track-non-branches' | Junio C Hamano | 2011-03-15 | 3 | -15/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | branch/checkout --track: Ensure that upstream branch is indeed a branch | Johan Herland | 2011-02-16 | 3 | -15/+31 |
* | | | | | | | | | | | | | | Documentation: running test with --debug keeps "trash" directory | Piotr Krukowiecki | 2011-03-15 | 1 | -0/+4 |
* | | | | | | | | | | | | | | Merge branch 'pw/p4' | Junio C Hamano | 2011-03-13 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | git-p4: test clone @all | Pete Wyckoff | 2011-03-13 | 1 | -0/+16 |
* | | | | | | | | | | | | | | | Merge branch 'js/cherry-pick-usability' | Junio C Hamano | 2011-03-09 | 2 | -54/+125 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Teach commit about CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 2 | -1/+30 |
| * | | | | | | | | | | | | | | | Introduce CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 1 | -1/+75 |
| * | | | | | | | | | | | | | | | t3507: introduce pristine-detach helper | Jonathan Nieder | 2011-02-21 | 1 | -54/+22 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'js/checkout-untracked-symlink' | Junio C Hamano | 2011-03-09 | 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 branch 'so/submodule-no-update-first-time' | Junio C Hamano | 2011-03-09 | 1 | -0/+52 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | t7406: "git submodule update {--merge|--rebase]" with new submodules | Spencer E. Olson | 2011-02-17 | 1 | -0/+52 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix typo in t/README | Mathias Lafeldt | 2011-03-09 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'jn/maint-commit-missing-template' | Junio C Hamano | 2011-03-04 | 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 'jk/diffstat-binary' | Junio C Hamano | 2011-03-04 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | diff: handle diffstat of rewritten binary files | Jeff King | 2011-02-22 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | | | Merge branch 'lt/rename-no-extra-copy-detection' | Junio C Hamano | 2011-03-04 | 5 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | diffcore-rename: properly honor the difference between -M and -C | Linus Torvalds | 2011-02-18 | 5 | -6/+6 |
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jn/test-terminal-punt-on-osx-breakage' | Junio C Hamano | 2011-03-04 | 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' | Junio C Hamano | 2011-03-04 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | clone: die when trying to clone missing local path | Jeff King | 2011-02-18 | 1 | -0/+13 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |