summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-225-41/+87
|\
| * merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-104-9/+21
| * fmt-merge-msg: add function to append shortlog onlyTay Ray Chuan2010-05-102-4/+10
| * fmt-merge-msg: refactor merge title formattingTay Ray Chuan2010-05-101-29/+36
| * fmt-merge-msg: minor refactor of fmt_merge_msg()Tay Ray Chuan2010-05-101-1/+6
| * merge: rename variableTay Ray Chuan2010-05-101-3/+3
| * merge: update commentTay Ray Chuan2010-05-101-1/+1
| * t7604-merge-custom-message: show that --log doesn't append to -mTay Ray Chuan2010-05-101-0/+12
| * t7604-merge-custom-message: shift expected output creationTay Ray Chuan2010-05-101-4/+8
* | Merge branch 'ph/clone-message-reword' into maintJunio C Hamano2010-06-221-1/+2
|\ \
| * | clone: reword messages to match the end-user perceptionPete Harlan2010-05-101-1/+2
* | | Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-222-7/+59
|\ \ \
| * | | commit --amend: cope with missing display nameJonathan Nieder2010-05-052-7/+59
* | | | Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-226-21/+68
|\ \ \ \
| * | | | Remove a redundant errno test in a usage of remove_pathPeter Collingbourne2010-03-281-1/+1
| * | | | Introduce remove_or_warn functionPeter Collingbourne2010-03-285-15/+51
| * | | | Implement the rmdir_or_warn functionPeter Collingbourne2010-03-282-0/+9
| * | | | Generalise the unlink_or_warn functionPeter Collingbourne2010-03-281-5/+7
* | | | | tests: remove unnecessary '^' from 'expr' regular expressionJunio C Hamano2010-06-212-3/+3
* | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-211-0/+21
* | | | | Merge branch 'mc/maint-zoneparse' into maintJunio C Hamano2010-06-211-1/+2
|\ \ \ \ \
| * | | | | Add "Z" as an alias for the timezone "UTC"Marcus Comstedt2010-05-191-1/+2
* | | | | | Merge branch 'jk/diff-m-doc' into maintJunio C Hamano2010-06-211-0/+7
|\ \ \ \ \ \
| * | | | | | docs: clarify meaning of -M for git-logJeff King2010-05-191-0/+7
| |/ / / / /
* | | | | | Merge branch 'jn/maint-doc-ignore' into maintJunio C Hamano2010-06-211-5/+9
|\ \ \ \ \ \
| * | | | | | gitignore.5: Clarify matching rulesJonathan Nieder2010-06-011-5/+9
* | | | | | | Merge branch 'bs/userdiff-php' into maintJunio C Hamano2010-06-211-1/+3
|\ \ \ \ \ \ \
| * | | | | | | diff: Support visibility modifiers in the PHP hunk header regexpBjörn Steinbrink2010-05-271-1/+3
* | | | | | | | Merge branch 'jk/maint-sha1-file-name-fix' into maintJunio C Hamano2010-06-211-13/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | remove over-eager caching in sha1_file_nameJeff King2010-05-251-13/+15
* | | | | | | | | Merge branch 'jk/maint-pull-dry-run-noop' into maintJunio C Hamano2010-06-211-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: do nothing on --dry-runJeff King2010-05-251-1/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano2010-06-211-26/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: fix coloring of extended diff headersBert Wesarg2010-05-201-26/+35
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'cb/assume-unchanged-fix' into maintJunio C Hamano2010-06-213-3/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: git-add does not update files marked "assume unchanged"Clemens Buchacher2010-05-081-2/+0
| * | | | | | | | | do not overwrite files marked "assume unchanged"Clemens Buchacher2010-05-012-1/+25
* | | | | | | | | | Merge branch 'jn/notes-doc' into maintJunio C Hamano2010-06-214-35/+238
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/notes: nitpicksJonathan Nieder2010-05-091-6/+6
| * | | | | | | | | | Documentation/notes: clean up description of rewriting configurationJonathan Nieder2010-05-091-18/+29
| * | | | | | | | | | Documentation/notes: simplify treatment of default display refsJonathan Nieder2010-05-091-17/+19
| * | | | | | | | | | Documentation/log: add a CONFIGURATION sectionJonathan Nieder2010-05-091-0/+42
| * | | | | | | | | | Documentation/notes: simplify treatment of default notes refJonathan Nieder2010-05-091-11/+20
| * | | | | | | | | | Documentation/notes: add configuration sectionJonathan Nieder2010-05-091-0/+59
| * | | | | | | | | | Documentation/notes: describe content of notes blobsJonathan Nieder2010-05-092-1/+75
| * | | | | | | | | | Documentation/notes: document format of notes treesJonathan Nieder2010-05-092-20/+26
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ab/test-cleanup' into maintJunio C Hamano2010-06-215-5/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Turn setup code in t2007-checkout-symlink.sh into a testÆvar Arnfjörð Bjarmason2010-05-081-2/+4
| * | | | | | | | | | Move t6000lib.sh to lib-*Ævar Arnfjörð Bjarmason2010-05-084-3/+3
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-217-11/+11
|\ \ \ \ \ \ \ \ \ \