summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ns/am-slacker'Junio C Hamano2009-02-043-2/+69
|\
| * git-am: Add --ignore-date optionNanako Shiraishi2009-01-253-1/+37
| * am: Add --committer-date-is-author-date optionJunio C Hamano2009-01-252-1/+32
* | Merge branch 'maint'Junio C Hamano2009-02-045-3/+4
|\ \
| * \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-035-4/+4
| |\ \
| | * | User-manual: "git stash <comment>" form is long goneWilliam Pursell2009-02-031-1/+1
| | * | add test-dump-cache-tree in MakefileGuanqun Lu2009-02-032-1/+1
| | * | fix typo in DocumentationGuanqun Lu2009-02-031-1/+1
| | * | apply: fix access to an uninitialized mode variable, found by valgrindJohannes Schindelin2009-02-031-1/+1
* | | | bash: offer to show (un)staged changesThomas Rast2009-02-031-2/+24
* | | | tests: fix test_commit() for case insensitive filesystemsJunio C Hamano2009-02-031-1/+1
* | | | t3412: further simplify setting of GIT_EDITORJunio C Hamano2009-02-031-4/+0
* | | | Merge branch 'maint'Junio C Hamano2009-02-031-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-031-0/+2
| |\ \ \ | | |/ /
| | * | grep: pass -I (ignore binary) down to external grepJunio C Hamano2009-02-021-0/+2
* | | | Merge branch 'jc/maint-add-u-remove-conflicted'Junio C Hamano2009-02-032-1/+69
|\ \ \ \
| * | | | add -u: do not fail to resolve a path as deletedJunio C Hamano2009-01-282-1/+69
* | | | | Merge branch 'jk/maint-cleanup-after-exec-failure'Junio C Hamano2009-02-033-10/+30
|\ \ \ \ \
| * | | | | git: use run_command() to execute dashed externalsJeff King2009-01-281-4/+13
| * | | | | run_command(): help callers distinguish errorsJeff King2009-01-281-0/+1
| * | | | | run_command(): handle missing command errors more gracefullyJeff King2009-01-281-4/+14
| * | | | | git: s/run_command/run_builtin/Jeff King2009-01-281-2/+2
| |/ / / /
* | | | | t3412: use log|name-rev instead of log --graphThomas Rast2009-02-011-26/+39
* | | | | gitweb: Update README that gitweb works better with PATH_INFOJakub Narebski2009-02-011-6/+4
* | | | | mailinfo: cleanup extra spaces for complex 'From:'Kirill Smelkov2009-02-014-8/+19
* | | | | Merge branch 'ks/maint-mailinfo-folded'Junio C Hamano2009-01-3122-10/+229
|\ \ \ \ \
| * | | | | mailinfo: tests for RFC2047 examplesKirill Smelkov2009-01-2814-0/+100
| * | | | | mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'Kirill Smelkov2009-01-285-1/+11
| * | | | | mailinfo: 'From:' header should be unfold as wellKirill Smelkov2009-01-122-1/+5
| * | | | | mailinfo: correctly handle multiline 'Subject:' headerKirill Smelkov2009-01-106-9/+114
* | | | | | Merge branch 'jc/maint-apply-fix'Junio C Hamano2009-01-311-1/+1
|\ \ \ \ \ \
| * | | | | | builtin-apply.c: do not set bogus mode in check_preimage() for deleted pathJunio C Hamano2009-01-281-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'am/maint-push-doc'Junio C Hamano2009-01-312-23/+34
|\ \ \ \ \ \
| * | | | | | Documentation: rework src/dst description in git pushAnders Melchiorsen2009-01-251-11/+12
| * | | | | | Documentation: more git push examplesAnders Melchiorsen2009-01-251-3/+13
| * | | | | | Documentation: simplify refspec format descriptionJunio C Hamano2009-01-252-9/+9
* | | | | | | Merge branch 'jc/maint-allow-uninteresting-missing'Junio C Hamano2009-01-312-3/+44
|\ \ \ \ \ \ \
| * | | | | | | revision traversal: allow UNINTERESTING objects to be missingJunio C Hamano2009-01-282-3/+44
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jg/tag-contains'Junio C Hamano2009-01-318-38/+185
|\ \ \ \ \ \ \
| * | | | | | | git-tag: Add --contains optionJake Goulding2009-01-283-3/+146
| * | | | | | | Make has_commit() non-staticJake Goulding2009-01-283-17/+19
| * | | | | | | Make opt_parse_with_commit() non-staticJake Goulding2009-01-283-18/+20
* | | | | | | | Merge branch 'js/maint-rebase-i-submodule'Junio C Hamano2009-01-312-5/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix submodule squashing into unrelated commitJohannes Schindelin2009-01-282-6/+5
| * | | | | | | | rebase -i squashes submodule changes into unrelated commitJunio C Hamano2009-01-281-0/+26
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano2009-01-313-67/+99
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano2009-01-273-67/+99
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | diff.c: output correct index lines for a split diffJunio C Hamano2009-01-272-66/+98
* | | | | | | | | Merge branch 'sp/runtime-prefix'Junio C Hamano2009-01-3121-46/+151
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Windows: Revert to default paths and convert them by RUNTIME_PREFIXSteffen Prohaska2009-01-261-3/+1