aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-22
|\
| * diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-06
* | Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano2010-06-22
|\ \
| * | t9129: fix UTF-8 locale detectionJunio C Hamano2010-06-02
* | | Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-22
|\ \ \
| * | | ls-files: allow relative pathspecClemens Buchacher2010-06-05
| * | | quote.c: separate quoting and relative path generationClemens Buchacher2010-06-05
* | | | Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-22
|\ \ \ \
| * | | | merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-10
| * | | | fmt-merge-msg: add function to append shortlog onlyTay Ray Chuan2010-05-10
| * | | | fmt-merge-msg: refactor merge title formattingTay Ray Chuan2010-05-10
| * | | | fmt-merge-msg: minor refactor of fmt_merge_msg()Tay Ray Chuan2010-05-10
| * | | | merge: rename variableTay Ray Chuan2010-05-10
| * | | | merge: update commentTay Ray Chuan2010-05-10
| * | | | t7604-merge-custom-message: show that --log doesn't append to -mTay Ray Chuan2010-05-10
| * | | | t7604-merge-custom-message: shift expected output creationTay Ray Chuan2010-05-10
* | | | | Merge branch 'ph/clone-message-reword' into maintJunio C Hamano2010-06-22
|\ \ \ \ \
| * | | | | clone: reword messages to match the end-user perceptionPete Harlan2010-05-09
* | | | | | Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-22
|\ \ \ \ \ \
| * | | | | | commit --amend: cope with missing display nameJonathan Nieder2010-05-04
* | | | | | | Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-22
|\ \ \ \ \ \ \
| * | | | | | | Remove a redundant errno test in a usage of remove_pathPeter Collingbourne2010-03-28
| * | | | | | | Introduce remove_or_warn functionPeter Collingbourne2010-03-28
| * | | | | | | Implement the rmdir_or_warn functionPeter Collingbourne2010-03-28
| * | | | | | | Generalise the unlink_or_warn functionPeter Collingbourne2010-03-28
* | | | | | | | tests: remove unnecessary '^' from 'expr' regular expressionJunio C Hamano2010-06-21
* | | | | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-21
* | | | | | | | Merge branch 'mc/maint-zoneparse' into maintJunio C Hamano2010-06-21
|\ \ \ \ \ \ \ \
| * | | | | | | | Add "Z" as an alias for the timezone "UTC"Marcus Comstedt2010-05-18
* | | | | | | | | Merge branch 'jk/diff-m-doc' into maintJunio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs: clarify meaning of -M for git-logJeff King2010-05-18
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jn/maint-doc-ignore' into maintJunio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitignore.5: Clarify matching rulesJonathan Nieder2010-05-31
* | | | | | | | | | Merge branch 'bs/userdiff-php' into maintJunio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: Support visibility modifiers in the PHP hunk header regexpBjörn Steinbrink2010-05-27
* | | | | | | | | | | Merge branch 'jk/maint-sha1-file-name-fix' into maintJunio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove over-eager caching in sha1_file_nameJeff King2010-05-25
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/maint-pull-dry-run-noop' into maintJunio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pull: do nothing on --dry-runJeff King2010-05-25
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: fix coloring of extended diff headersBert Wesarg2010-05-19
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'cb/assume-unchanged-fix' into maintJunio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: git-add does not update files marked "assume unchanged"Clemens Buchacher2010-05-08
| * | | | | | | | | | | do not overwrite files marked "assume unchanged"Clemens Buchacher2010-05-01
* | | | | | | | | | | | Merge branch 'jn/notes-doc' into maintJunio C Hamano2010-06-21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/notes: nitpicksJonathan Nieder2010-05-08
| * | | | | | | | | | | | Documentation/notes: clean up description of rewriting configurationJonathan Nieder2010-05-08
| * | | | | | | | | | | | Documentation/notes: simplify treatment of default display refsJonathan Nieder2010-05-08
| * | | | | | | | | | | | Documentation/log: add a CONFIGURATION sectionJonathan Nieder2010-05-08
| * | | | | | | | | | | | Documentation/notes: simplify treatment of default notes refJonathan Nieder2010-05-08