summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* notes: Initialise variable to appease gccRamsay Jones2010-06-281-1/+1
* notes: check number of parameters to "git notes copy"Jeff King2010-06-282-0/+10
* msvc: Fix some compiler warningsRamsay Jones2010-06-251-4/+4
* Documentation: grep: fix asciidoc problem with --Christian Couder2010-06-251-1/+1
* msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones2010-06-243-5/+5
* Update draft release notes to 1.7.1.1Junio C Hamano2010-06-221-0/+21
* Merge branch 'ic/maint-rebase-i-abort' into maintJunio C Hamano2010-06-222-1/+12
|\
| * rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort2010-06-112-1/+12
* | Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2010-06-222-6/+13
|\ \
| * | commit: use value of GIT_REFLOG_ACTION env variable as reflog messageChristian Couder2010-06-132-6/+13
* | | Merge branch 'jk/maint-advice-empty-amend' into maintJunio C Hamano2010-06-221-0/+7
|\ \ \
| * | | commit: give advice on empty amendJeff King2010-06-111-0/+7
| | |/ | |/|
* | | Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2010-06-222-6/+72
|\ \ \
| * | | commit::print_summary(): don't use format_commit_message()Tay Ray Chuan2010-06-132-8/+6
| * | | t7502-commit: add summary output tests for empty and merge commitsTay Ray Chuan2010-05-281-2/+27
| * | | t7502-commit: add tests for summary outputTay Ray Chuan2010-05-281-0/+43
* | | | Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2010-06-222-0/+33
|\ \ \ \
| * | | | rebase -i -p: document shortcomingsJonathan Nieder2010-06-112-0/+33
| | |/ / | |/| |
* | | | Merge branch 'jn/checkout-doc' into maintJunio C Hamano2010-06-221-23/+31
|\ \ \ \
| * | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-06-111-19/+21
| * | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-05-311-11/+17
* | | | | Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-223-5/+98
|\ \ \ \ \
| * | | | | diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-063-6/+99
* | | | | | Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano2010-06-221-7/+13
|\ \ \ \ \ \
| * | | | | | t9129: fix UTF-8 locale detectionJunio C Hamano2010-06-021-7/+13
* | | | | | | Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-224-71/+110
|\ \ \ \ \ \ \
| * | | | | | | ls-files: allow relative pathspecClemens Buchacher2010-06-052-42/+45
| * | | | | | | quote.c: separate quoting and relative path generationClemens Buchacher2010-06-052-29/+65
* | | | | | | | 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-091-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-042-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-181-1/+2