Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'lp/config-vername-check' | Junio C Hamano | 2011-02-27 | 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 'mg/placeholders-are-lowercase' | Junio C Hamano | 2011-02-27 | 1 | -1/+1 |
|\ \ | |||||
| * | | Make <identifier> lowercase as per CodingGuidelines | Michael J Gruber | 2011-02-15 | 1 | -1/+1 |
* | | | Merge branch 'mg/patch-id' | Junio C Hamano | 2011-02-27 | 1 | -0/+36 |
|\ \ \ | |||||
| * | | | git-patch-id: do not trip over "no newline" markers | Michael J Gruber | 2011-02-17 | 1 | -1/+1 |
| * | | | git-patch-id: test for "no newline" markers | Michael J Gruber | 2011-02-17 | 1 | -0/+36 |
* | | | | Merge branch 'mz/rerere-remaining' | Junio C Hamano | 2011-02-27 | 1 | -6/+34 |
|\ \ \ \ | |||||
| * | | | | mergetool: don't skip modify/remove conflicts | Martin von Zweigbergk | 2011-02-16 | 1 | -6/+34 |
* | | | | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' | Junio C Hamano | 2011-02-27 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | merge: honor prepare-commit-msg hook | Jay Soffian | 2011-02-15 | 1 | -0/+12 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'nd/hash-object-sanity' | Junio C Hamano | 2011-02-27 | 1 | -0/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Make hash-object more robust against malformed objects | Nguyễn Thái Ngọc Duy | 2011-02-07 | 1 | -0/+13 |
* | | | | | | Merge branch 'pw/p4' | Junio C Hamano | 2011-02-27 | 1 | -0/+100 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-p4: support clone --bare | Pete Wyckoff | 2011-02-21 | 1 | -0/+10 |
| * | | | | | | git-p4: decode p4 wildcard characters | Pete Wyckoff | 2011-02-21 | 1 | -0/+22 |
| * | | | | | | git-p4: fix key error for p4 problem | Pete Wyckoff | 2011-02-21 | 1 | -0/+13 |
| * | | | | | | git-p4: test script | Pete Wyckoff | 2011-02-21 | 1 | -0/+55 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'uk/checkout-ambiguous-ref' | Junio C Hamano | 2011-02-27 | 2 | -0/+154 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rename t2019 with typo "amiguous" that meant "ambiguous" | Junio C Hamano | 2011-02-15 | 1 | -0/+0 |
| * | | | | | | checkout: introduce --detach synonym for "git checkout foo^{commit}" | Junio C Hamano | 2011-02-08 | 1 | -0/+95 |
| * | | | | | | checkout: fix bug with ambiguous refs | Junio C Hamano | 2011-01-11 | 1 | -0/+59 |
* | | | | | | | Merge branch 'mo/perl-bidi-pipe-envfix' | Junio C Hamano | 2011-02-27 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | perl: command_bidi_pipe() method should set-up git environmens | Masatake Osanai | 2011-02-14 | 1 | -0/+10 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'en/object-list-with-pathspec' | Junio C Hamano | 2011-02-27 | 1 | -0/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add testcases showing how pathspecs are handled with rev-list --objects | Elijah Newren | 2011-02-03 | 1 | -0/+51 |
* | | | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-02-27 | 3 | -12/+107 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | t6004: add pathspec globbing test for log family | Junio C Hamano | 2011-02-03 | 1 | -12/+57 |
| * | | | | | | | t7810: overlapping pathspecs and depth limit | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -0/+18 |
| * | | | | | | | tree_entry_interesting(): optimize wildcard matching when base is matched | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -0/+18 |
| * | | | | | | | tree_entry_interesting(): support wildcard matching | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -0/+14 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | gitweb: Make i18n (encoding) tests in t9500 leave clean state | Jakub Narebski | 2011-02-27 | 1 | -1/+5 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-02-21 | 4 | -89/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/t7500-commit.sh: use test_cmp instead of test | Ævar Arnfjörð Bjarmason | 2011-02-21 | 1 | -1/+6 |
| * | | | | | | | t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate | Ævar Arnfjörð Bjarmason | 2011-02-21 | 3 | -88/+6 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'tr/merge-unborn-clobber' | Junio C Hamano | 2011-02-09 | 1 | -0/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Exhibit merge bug that clobbers index&WT | Thomas Rast | 2010-08-25 | 1 | -0/+16 |
* | | | | | | | | Merge branch 'tr/diff-words-test' | Junio C Hamano | 2011-02-09 | 40 | -231/+917 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t4034 (diff --word-diff): add a minimum Perl drier test vector | Junio C Hamano | 2011-01-18 | 4 | -0/+58 |
| * | | | | | | | | t4034 (diff --word-diff): style suggestions | Jonathan Nieder | 2011-01-18 | 1 | -245/+205 |
| * | | | | | | | | t4034: bulk verify builtin word regex sanity | Thomas Rast | 2011-01-18 | 37 | -0/+668 |
* | | | | | | | | | Merge branch 'rr/fi-import-marks-if-exists' | Junio C Hamano | 2011-02-09 | 1 | -0/+55 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fast-import: Introduce --import-marks-if-exists | Ramkumar Ramachandra | 2011-01-18 | 1 | -0/+55 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'ae/better-template-failure-report' | Junio C Hamano | 2011-02-09 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Improve error messages when temporary file creation fails | Arnout Engelen | 2010-12-21 | 1 | -0/+13 |
* | | | | | | | | | | Merge branch 'jn/cherry-pick-strategy-option' | Junio C Hamano | 2011-02-09 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 | 1 | -0/+14 |
* | | | | | | | | | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2011-02-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | fast-import: introduce "feature notes" command | Jonathan Nieder | 2011-02-09 | 1 | -0/+1 |