summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.10.4v1.7.10.4Junio C Hamano2012-06-032-1/+6
* Merge branch 'ef/maint-rebase-error-message' into maintJunio C Hamano2012-06-032-1/+6
|\
| * rebase: report invalid commit correctlyErik Faye-Lund2012-05-302-1/+6
* | Start preparing for 1.7.10.4Junio C Hamano2012-06-013-2/+28
* | Merge branch 'ef/http-o-depends-on-gvf' into maintJunio C Hamano2012-06-011-1/+1
|\ \
| * | Makefile: add missing GIT-VERSION-FILE dependencyErik Faye-Lund2012-05-311-1/+1
* | | Merge branch 'rs/maint-grep-F' into maintJunio C Hamano2012-06-015-24/+68
|\ \ \
| * | | grep: stop leaking line strings with -fRené Scharfe2012-05-211-5/+2
| * | | grep: support newline separated pattern listRené Scharfe2012-05-204-3/+41
| * | | grep: factor out do_append_grep_pat()René Scharfe2012-05-201-6/+9
| * | | grep: factor out create_grep_pat()René Scharfe2012-05-201-11/+17
* | | | Merge branch 'jk/ident-split-fix' into maintJunio C Hamano2012-06-012-1/+8
|\ \ \ \
| * | | | fix off-by-one error in split_ident_lineJeff King2012-05-222-1/+8
* | | | | Merge branch 'jk/pretty-commit-header-incomplete-line' into maintJunio C Hamano2012-06-011-1/+4
|\ \ \ \ \
| * | | | | avoid segfault when reading header of malformed commitsJeff King2012-05-221-1/+4
* | | | | | Merge branch 'jk/format-person-part-buffer-limit' into maintJunio C Hamano2012-06-011-2/+4
|\ \ \ \ \ \
| * | | | | | pretty: avoid buffer overflow in format_person_partJeff King2012-05-221-2/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ap/checkout-no-progress-for-non-tty' into maintJunio C Hamano2012-06-011-2/+2
|\ \ \ \ \ \
| * | | | | | checkout: no progress messages if !isatty(2).Avery Pennarun2012-05-241-2/+2
* | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-06-011-247/+289
|\ \ \ \ \ \ \
| * | | | | | | Update Swedish translation (728t0f0u)Peter Krefting2012-05-291-247/+289
* | | | | | | | Git 1.7.10.3v1.7.10.3Junio C Hamano2012-05-252-5/+16
* | | | | | | | Merge branch 'hv/submodule-alt-odb' into maintJunio C Hamano2012-05-254-2/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | teach add_submodule_odb() to look for alternatesHeiko Voigt2012-05-144-2/+39
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'bp/diff-no-index-strbuf-fix' into maintJunio C Hamano2012-05-252-2/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | diff --no-index: don't leak buffers in queue_diffBobby Powers2012-05-161-2/+2
| * | | | | | | | diff --no-index: reset temporary buffer lengths on directory iterationBobby Powers2012-05-162-0/+25
* | | | | | | | | fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds2012-05-251-3/+5
* | | | | | | | | config doc: remove confusion about relative GIT_DIR from FILES sectionJonathan Nieder2012-05-251-3/+1
* | | | | | | | | Update draft release notes to 1.7.10.3Junio C Hamano2012-05-241-0/+6
* | | | | | | | | Merge branch 'jk/maint-status-porcelain-z-b' into maintJunio C Hamano2012-05-245-89/+105
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | status: respect "-b" for porcelain formatJeff King2012-05-085-11/+16
| * | | | | | | | status: fix null termination with "-b"Jeff King2012-05-082-3/+13
| * | | | | | | | status: refactor null_termination optionJeff King2012-05-083-24/+24
| * | | | | | | | commit: refactor option parsingJeff King2012-05-081-58/+59
* | | | | | | | | osxkeychain: pull make config from top-level directoryJeff King2012-05-241-2/+5
* | | | | | | | | Consistently use "superproject" instead of "supermodule"Jens Lehmann2012-05-203-4/+4
* | | | | | | | | t3404: begin "exchange commits with -p" test with correct preconditionsJohannes Sixt2012-05-201-0/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | l10n: de.po: translate 3 new messagesRalf Thielow2012-05-151-101/+127
* | | | | | | | l10n: zh_CN.po: translate 3 new messagesJiang Xin2012-05-151-99/+121
* | | | | | | | l10n: Update git.pot (3 new, 2 removed messages)Jiang Xin2012-05-151-96/+108
* | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-05-144-515/+538
|\ \ \ \ \ \ \ \
| * | | | | | | | l10n: zh_CN.po: translate 1 new messageJiang Xin2012-05-121-94/+98
| * | | | | | | | l10n: de.po: translate one new messageRalf Thielow2012-05-081-130/+148
| * | | | | | | | l10n: de.po: unify translation of "ahead" and "behind"Ralf Thielow2012-05-081-8/+9
| * | | | | | | | l10n: de.po: collection of improvementsRalf Thielow2012-05-081-125/+129
| * | | | | | | | l10n: de.po: translate "remote" as "extern"Ralf Thielow2012-05-081-23/+23
| * | | | | | | | l10n: de.po: translate "track" as "beobachten"Ralf Thielow2012-05-081-12/+12
| * | | | | | | | l10n: add new members to German translation teamRalf Thielow2012-05-081-0/+3
| * | | | | | | | l10n: de.po: collection of suggestionsThomas Rast2012-05-081-55/+44