summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* show-branch: fix description of --date-ordertr/do-not-call-submodules-subprojectsThomas Rast2013-07-181-3/+3
* apply, entry: speak of submodules instead of subprojectsThomas Rast2013-07-182-3/+3
* Git 1.8.3.3v1.8.3.3Junio C Hamano2013-07-153-2/+24
* Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2013-07-152-1/+15
|\
| * apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-212-1/+15
* | Merge branch 'bc/http-keep-memory-given-to-curl' into maintJunio C Hamano2013-07-151-3/+9
|\ \
| * | http.c: don't rewrite the user:passwd string multiple timesBrandon Casey2013-06-191-3/+9
* | | Merge branch 'jk/pull-into-dirty-unborn' into maintJunio C Hamano2013-07-152-2/+38
|\ \ \
| * | | pull: merge into unborn by fast-forwarding from empty treeThomas Rast2013-06-202-1/+37
| * | | pull: update unborn branch tip after indexJeff King2013-06-201-2/+2
* | | | Merge branch 'fg/submodule-non-ascii-path' into maintJunio C Hamano2013-07-152-1/+17
|\ \ \ \
| * | | | t7400: test of UTF-8 submodule names pass under Mac OSTorsten Bögershausen2013-06-201-8/+11
| * | | | handle multibyte characters in nameFredrik Gustafsson2013-06-142-1/+14
* | | | | Merge branch 'fc/sequencer-plug-leak' into maintJunio C Hamano2013-07-151-7/+11
|\ \ \ \ \
| * | | | | sequencer: avoid leaking message buffer when refusing to create an empty commitFelipe Contreras2013-06-061-2/+4
| * | | | | sequencer: remove useless indentationFelipe Contreras2013-06-031-7/+9
| |/ / / /
* | | | | Merge branch 'mt/send-email-cc-match-fix' into maintJunio C Hamano2013-07-152-9/+106
|\ \ \ \ \
| * | | | | send-email: sanitize author when writing From lineMichael S. Tsirkin2013-06-202-3/+4
| * | | | | send-email: add test for duplicate utf8 nameMichael S. Tsirkin2013-06-201-0/+14
| * | | | | test-send-email: test for pre-sanitized self nameMichael S. Tsirkin2013-06-051-0/+5
| * | | | | t/send-email: test suppress-cc=self with non-asciiMichael S. Tsirkin2013-06-051-0/+5
| * | | | | t/send-email: add test with quoted senderMichael S. Tsirkin2013-06-051-0/+20
| * | | | | send-email: make --suppress-cc=self sanitize inputMichael S. Tsirkin2013-06-051-8/+15
| * | | | | t/send-email: test suppress-cc=self on cccmdMichael S. Tsirkin2013-06-051-1/+3
| * | | | | send-email: fix suppress-cc=self on cccmdMichael S. Tsirkin2013-06-051-1/+1
| * | | | | t/send-email.sh: add test for suppress-cc=selfMichael S. Tsirkin2013-06-031-0/+43
* | | | | | fixup-builtins: retire an old transition helper scriptRamkumar Ramachandra2013-07-032-19/+0
* | | | | | Update draft release notes to 1.8.3.3Junio C Hamano2013-07-031-0/+15
* | | | | | Merge branch 'rr/diffcore-pickaxe-doc' into maintJunio C Hamano2013-07-033-28/+59
|\ \ \ \ \ \
| * | | | | | diffcore-pickaxe doc: document -S and -G properlyRamkumar Ramachandra2013-06-032-26/+57
| * | | | | | diffcore-pickaxe: make error messages more consistentRamkumar Ramachandra2013-06-031-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'cr/git-work-tree-sans-git-dir' into maintJunio C Hamano2013-07-031-3/+1
|\ \ \ \ \ \
| * | | | | | git.txt: remove stale comment regarding GIT_WORK_TREEChris Rorvick2013-06-031-3/+1
* | | | | | | Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maintJunio C Hamano2013-07-031-3/+3
|\ \ \ \ \ \ \
| * | | | | | | read-cache: trivial style cleanupsFelipe Contreras2013-06-031-2/+2
| * | | | | | | read-cache: fix wrong 'the_index' usageFelipe Contreras2013-06-031-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'dm/unbash-subtree' into maintJunio C Hamano2013-07-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bashDmitry Marakasov2013-05-211-1/+1
* | | | | | | | Merge branch 'jc/core-checkstat' into maintJunio C Hamano2013-07-031-1/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | deprecate core.statinfo at Git 2.0 boundaryJunio C Hamano2013-05-061-1/+14
* | | | | | | | | Merge branch 'jc/t5551-posix-sed-bre' into maintJunio C Hamano2013-07-031-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5551: do not use unportable sed '\+'Junio C Hamano2013-05-121-2/+6
* | | | | | | | | | Merge branch 'vv/help-unknown-ref' into maintJunio C Hamano2013-07-033-1/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge: use help_unknown_ref()Vikrant Varma2013-05-081-1/+2
| * | | | | | | | | | help: add help_unknown_ref()Vikrant Varma2013-05-082-0/+55
* | | | | | | | | | | Merge branch 'rs/empty-archive' into maintJunio C Hamano2013-07-032-0/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5004: resurrect original empty tar archive testRené Scharfe2013-05-092-0/+14
| * | | | | | | | | | | t5004: avoid using tar for checking emptiness of archiveRené Scharfe2013-05-091-3/+2
* | | | | | | | | | | | Merge branch 'rh/merge-options-doc-fix' into maintJunio C Hamano2013-07-031-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/merge-options.txt: restore `-e` optionRichard Hansen2013-05-161-1/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | |