Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t/t9001: use egrep when regular expressions are involved | Brandon Casey | 2010-06-29 | 1 | -3/+3 |
* | Merge branch 'tr/send-email-8bit' into maint | Junio C Hamano | 2010-06-28 | 1 | -0/+77 |
|\ | |||||
| * | send-email: ask about and declare 8bit mails | Thomas Rast | 2010-06-18 | 1 | -0/+77 |
* | | Merge branch 'js/maint-am-rebase-invalid-author' into maint | Junio C Hamano | 2010-06-28 | 1 | -2/+7 |
|\ \ | |||||
| * | | am: use get_author_ident_from_commit instead of mailinfo when rebasing | Jay Soffian | 2010-06-16 | 1 | -2/+7 |
| |/ | |||||
* | | notes: check number of parameters to "git notes copy" | Jeff King | 2010-06-28 | 1 | -0/+6 |
* | | Merge branch 'ic/maint-rebase-i-abort' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+10 |
|\ \ | |||||
| * | | rebase -i: Abort cleanly if new base cannot be checked out | Ian Ward Comfort | 2010-06-11 | 1 | -0/+10 |
* | | | Merge branch 'cc/maint-commit-reflog-msg' into maint | Junio C Hamano | 2010-06-22 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | commit: use value of GIT_REFLOG_ACTION env variable as reflog message | Christian Couder | 2010-06-13 | 1 | -2/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'tc/commit-abbrev-fix' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+68 |
|\ \ \ | |||||
| * | | | commit::print_summary(): don't use format_commit_message() | Tay Ray Chuan | 2010-06-13 | 1 | -2/+2 |
| * | | | t7502-commit: add summary output tests for empty and merge commits | Tay Ray Chuan | 2010-05-28 | 1 | -2/+27 |
| * | | | t7502-commit: add tests for summary output | Tay Ray Chuan | 2010-05-28 | 1 | -0/+43 |
* | | | | Merge branch 'jn/document-rebase-i-p-limitation' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | rebase -i -p: document shortcomings | Jonathan Nieder | 2010-06-11 | 1 | -0/+6 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'cc/maint-diff-CC-binary' into maint | Junio C Hamano | 2010-06-22 | 2 | -0/+82 |
|\ \ \ \ | |||||
| * | | | | diff: fix "git show -C -C" output when renaming a binary file | Christian Couder | 2010-06-06 | 2 | -0/+82 |
* | | | | | Merge branch 'jc/t9129-any-utf8' into maint | Junio C Hamano | 2010-06-22 | 1 | -7/+13 |
|\ \ \ \ \ | |||||
| * | | | | | t9129: fix UTF-8 locale detection | Junio C Hamano | 2010-06-02 | 1 | -7/+13 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'cb/ls-files-cdup' into maint | Junio C Hamano | 2010-06-22 | 1 | -8/+4 |
|\ \ \ \ \ | |||||
| * | | | | | ls-files: allow relative pathspec | Clemens Buchacher | 2010-06-05 | 1 | -8/+4 |
* | | | | | | Merge branch 'tc/merge-m-log' into maint | Junio C Hamano | 2010-06-22 | 1 | -4/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 | 1 | -1/+1 |
| * | | | | | | t7604-merge-custom-message: show that --log doesn't append to -m | Tay Ray Chuan | 2010-05-10 | 1 | -0/+12 |
| * | | | | | | t7604-merge-custom-message: shift expected output creation | Tay Ray Chuan | 2010-05-10 | 1 | -4/+8 |
* | | | | | | | Merge branch 'jn/maint-amend-missing-name' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+46 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit --amend: cope with missing display name | Jonathan Nieder | 2010-05-04 | 1 | -0/+46 |
* | | | | | | | | Merge branch 'pc/remove-warn' into maint | Junio C Hamano | 2010-06-22 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Introduce remove_or_warn function | Peter Collingbourne | 2010-03-28 | 1 | -0/+38 |
* | | | | | | | | | tests: remove unnecessary '^' from 'expr' regular expression | Junio C Hamano | 2010-06-21 | 2 | -3/+3 |
* | | | | | | | | | Merge branch 'cb/assume-unchanged-fix' into maint | Junio C Hamano | 2010-06-21 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | do not overwrite files marked "assume unchanged" | Clemens Buchacher | 2010-05-01 | 1 | -0/+24 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jn/notes-doc' into maint | Junio C Hamano | 2010-06-21 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/notes: describe content of notes blobs | Jonathan Nieder | 2010-05-08 | 1 | -0/+38 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ab/test-cleanup' into maint | Junio C Hamano | 2010-06-21 | 5 | -5/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Turn setup code in t2007-checkout-symlink.sh into a test | Ævar Arnfjörð Bjarmason | 2010-05-07 | 1 | -2/+4 |
| * | | | | | | | | | Move t6000lib.sh to lib-* | Ævar Arnfjörð Bjarmason | 2010-05-07 | 4 | -3/+3 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'bg/apply-blank-trailing-context' into maint | Junio C Hamano | 2010-06-21 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | apply: Allow blank *trailing* context lines to match beyond EOF | Björn Gustavsson | 2010-04-07 | 1 | -0/+12 |
* | | | | | | | | | | Merge branch 'cb/maint-stash-orphaned-file' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+150 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | stash tests: stash can lose data in a file removed from the index | Charles Bailey | 2010-04-20 | 1 | -0/+150 |
* | | | | | | | | | | | Merge branch 'mg/advice-statushints' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+45 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | wt-status: take advice.statusHints seriously | Michael J Gruber | 2010-05-06 | 1 | -1/+1 |
| * | | | | | | | | | | | t7508: test advice.statusHints | Michael J Gruber | 2010-05-06 | 1 | -0/+45 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jn/maint-bundle' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t5704 (bundle): add tests for bundle --stdin | Jonathan Nieder | 2010-04-19 | 1 | -0/+16 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jn/t7006-fixup' into maint | Junio C Hamano | 2010-06-16 | 2 | -48/+117 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t7006: guard cleanup with test_expect_success | Jonathan Nieder | 2010-04-14 | 2 | -48/+117 |
* | | | | | | | | | | | | Merge branch 'jn/shortlog' into maint | Junio C Hamano | 2010-06-16 | 2 | -24/+123 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |