Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tc/merge-m-log' into maint | Junio C Hamano | 2010-06-22 | 5 | -41/+87 |
|\ | |||||
| * | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 | 4 | -9/+21 |
| * | fmt-merge-msg: add function to append shortlog only | Tay Ray Chuan | 2010-05-10 | 2 | -4/+10 |
| * | fmt-merge-msg: refactor merge title formatting | Tay Ray Chuan | 2010-05-10 | 1 | -29/+36 |
| * | fmt-merge-msg: minor refactor of fmt_merge_msg() | Tay Ray Chuan | 2010-05-10 | 1 | -1/+6 |
| * | merge: rename variable | Tay Ray Chuan | 2010-05-10 | 1 | -3/+3 |
| * | merge: update comment | 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 'ph/clone-message-reword' into maint | Junio C Hamano | 2010-06-22 | 1 | -1/+2 |
|\ \ | |||||
| * | | clone: reword messages to match the end-user perception | Pete Harlan | 2010-05-10 | 1 | -1/+2 |
* | | | Merge branch 'jn/maint-amend-missing-name' into maint | Junio C Hamano | 2010-06-22 | 2 | -7/+59 |
|\ \ \ | |||||
| * | | | commit --amend: cope with missing display name | Jonathan Nieder | 2010-05-05 | 2 | -7/+59 |
* | | | | Merge branch 'pc/remove-warn' into maint | Junio C Hamano | 2010-06-22 | 6 | -21/+68 |
|\ \ \ \ | |||||
| * | | | | Remove a redundant errno test in a usage of remove_path | Peter Collingbourne | 2010-03-28 | 1 | -1/+1 |
| * | | | | Introduce remove_or_warn function | Peter Collingbourne | 2010-03-28 | 5 | -15/+51 |
| * | | | | Implement the rmdir_or_warn function | Peter Collingbourne | 2010-03-28 | 2 | -0/+9 |
| * | | | | Generalise the unlink_or_warn function | Peter Collingbourne | 2010-03-28 | 1 | -5/+7 |
* | | | | | tests: remove unnecessary '^' from 'expr' regular expression | Junio C Hamano | 2010-06-21 | 2 | -3/+3 |
* | | | | | Update draft release notes to 1.7.1.1 | Junio C Hamano | 2010-06-21 | 1 | -0/+21 |
* | | | | | Merge branch 'mc/maint-zoneparse' into maint | Junio C Hamano | 2010-06-21 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Add "Z" as an alias for the timezone "UTC" | Marcus Comstedt | 2010-05-19 | 1 | -1/+2 |
* | | | | | | Merge branch 'jk/diff-m-doc' into maint | Junio C Hamano | 2010-06-21 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | docs: clarify meaning of -M for git-log | Jeff King | 2010-05-19 | 1 | -0/+7 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jn/maint-doc-ignore' into maint | Junio C Hamano | 2010-06-21 | 1 | -5/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitignore.5: Clarify matching rules | Jonathan Nieder | 2010-06-01 | 1 | -5/+9 |
* | | | | | | | Merge branch 'bs/userdiff-php' into maint | Junio C Hamano | 2010-06-21 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff: Support visibility modifiers in the PHP hunk header regexp | Björn Steinbrink | 2010-05-27 | 1 | -1/+3 |
* | | | | | | | | Merge branch 'jk/maint-sha1-file-name-fix' into maint | Junio C Hamano | 2010-06-21 | 1 | -13/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remove over-eager caching in sha1_file_name | Jeff King | 2010-05-25 | 1 | -13/+15 |
* | | | | | | | | | Merge branch 'jk/maint-pull-dry-run-noop' into maint | Junio C Hamano | 2010-06-21 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pull: do nothing on --dry-run | Jeff King | 2010-05-25 | 1 | -1/+6 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'bw/diff-metainfo-color' into maint | Junio C Hamano | 2010-06-21 | 1 | -26/+35 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff: fix coloring of extended diff headers | Bert Wesarg | 2010-05-20 | 1 | -26/+35 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cb/assume-unchanged-fix' into maint | Junio C Hamano | 2010-06-21 | 3 | -3/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: git-add does not update files marked "assume unchanged" | Clemens Buchacher | 2010-05-08 | 1 | -2/+0 |
| * | | | | | | | | | do not overwrite files marked "assume unchanged" | Clemens Buchacher | 2010-05-01 | 2 | -1/+25 |
* | | | | | | | | | | Merge branch 'jn/notes-doc' into maint | Junio C Hamano | 2010-06-21 | 4 | -35/+238 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation/notes: nitpicks | Jonathan Nieder | 2010-05-09 | 1 | -6/+6 |
| * | | | | | | | | | | Documentation/notes: clean up description of rewriting configuration | Jonathan Nieder | 2010-05-09 | 1 | -18/+29 |
| * | | | | | | | | | | Documentation/notes: simplify treatment of default display refs | Jonathan Nieder | 2010-05-09 | 1 | -17/+19 |
| * | | | | | | | | | | Documentation/log: add a CONFIGURATION section | Jonathan Nieder | 2010-05-09 | 1 | -0/+42 |
| * | | | | | | | | | | Documentation/notes: simplify treatment of default notes ref | Jonathan Nieder | 2010-05-09 | 1 | -11/+20 |
| * | | | | | | | | | | Documentation/notes: add configuration section | Jonathan Nieder | 2010-05-09 | 1 | -0/+59 |
| * | | | | | | | | | | Documentation/notes: describe content of notes blobs | Jonathan Nieder | 2010-05-09 | 2 | -1/+75 |
| * | | | | | | | | | | Documentation/notes: document format of notes trees | Jonathan Nieder | 2010-05-09 | 2 | -20/+26 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | 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-08 | 1 | -2/+4 |
| * | | | | | | | | | | Move t6000lib.sh to lib-* | Ævar Arnfjörð Bjarmason | 2010-05-08 | 4 | -3/+3 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 2010-06-21 | 7 | -11/+11 |
|\ \ \ \ \ \ \ \ \ \ |