summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | avoid segfault on submodule.*.path set to an empty "true"jl/some-submodule-config-are-not-booleanJharrod LaFon2013-08-192-0/+16
* | | | | | | | | | | | | | Merge branch 'tr/log-full-diff-keep-true-parents' into maintJunio C Hamano2013-09-188-3/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | log: use true parents for diff when walking reflogstr/log-full-diff-keep-true-parentsThomas Rast2013-08-052-3/+47
| * | | | | | | | | | | | | | log: use true parents for diff even when rewritingThomas Rast2013-08-017-3/+90
* | | | | | | | | | | | | | | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maintJunio C Hamano2013-09-184-31/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | builtin/fetch.c: Fix a sparse warningjc/transport-do-not-use-connect-twice-in-fetchRamsay Jones2013-08-281-1/+1
| * | | | | | | | | | | | | | | fetch: work around "transport-take-over" hackJunio C Hamano2013-08-073-0/+21
| * | | | | | | | | | | | | | | fetch: refactor code that fetches leftover tagsJunio C Hamano2013-08-071-5/+9
| * | | | | | | | | | | | | | | fetch: refactor code that prepares a transportJunio C Hamano2013-08-071-20/+26
| * | | | | | | | | | | | | | | fetch: rename file-scope global "transport" to "gtransport"Junio C Hamano2013-08-071-11/+11
| * | | | | | | | | | | | | | | t5802: add test for connect helperJunio C Hamano2013-08-071-0/+72
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sp/clip-read-write-to-8mb' into maintJunio C Hamano2013-09-186-27/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"sp/clip-read-write-to-8mbSteffen Prohaska2013-08-204-27/+0
| * | | | | | | | | | | | | | | xread, xwrite: limit size of IO to 8MBSteffen Prohaska2013-08-202-0/+26
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/mailmap-incomplete-line' into maintJunio C Hamano2013-09-182-13/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mailmap: handle mailmap blobs without trailing newlinesjk/mailmap-incomplete-lineJeff King2013-08-282-13/+24
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | t7406-submodule-update: add missing &&Tay Ray Chuan2013-09-171-1/+1
* | | | | | | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2013-09-111-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | l10n: de.po: use "das Tag" instead of "der Tag"Ralf Thielow2013-09-081-11/+11
* | | | | | | | | | | | | | | | Merge branch 'nd/fetch-pack-shallow-fix' into maintJunio C Hamano2013-09-052-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fetch-pack: do not remove .git/shallow file when --depth is not specifiednd/fetch-pack-shallow-fixNguyễn Thái Ngọc Duy2013-08-252-1/+19
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'hv/config-from-blob' into maintJunio C Hamano2013-09-051-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | config: do not use C function names as struct membershv/config-from-blobJeff King2013-08-261-16/+16
* | | | | | | | | | | | | | | | | Merge branch 'maint-1.8.3' into maintJunio C Hamano2013-09-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.2' into maint-1.8.3maint-1.8.3Junio C Hamano2013-09-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Documentation/git-merge.txt: fix formatting of example blockmaint-1.8.2Andreas Schwab2013-09-051-2/+2
* | | | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-po into maintJunio C Hamano2013-09-032-718/+874
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | l10n: fr.po: hotfix for commit 6b388fcSebastien Helleu2013-08-302-718/+874
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'maint-1.8.3' into maintJunio C Hamano2013-09-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'maint-1.8.2' into maint-1.8.3Junio C Hamano2013-09-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | fix shell syntax error in templateThorsten Glaser2013-08-301-0/+1
| | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Git 1.8.4v1.8.4Junio C Hamano2013-08-232-1/+6
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Typofix draft release notes to 1.8.4Junio C Hamano2013-08-211-2/+2
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Git 1.8.4-rc4v1.8.4-rc4Junio C Hamano2013-08-192-10/+1
* | | | | | | | | | | | Revert "Add new @ shortcut for HEAD"Junio C Hamano2013-08-145-28/+0
* | | | | | | | | | | | Revert "git stash: avoid data loss when "git stash save" kills a directory"Junio C Hamano2013-08-143-40/+2
* | | | | | | | | | | | Git 1.8.4-rc3v1.8.4-rc3Junio C Hamano2013-08-131-1/+1
* | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-08-132-0/+9672
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | l10n: Add reference for french translation teamJean-Noel Avila2013-08-111-0/+4
| * | | | | | | | | | | | l10n: fr.po: 821/2112 messages translatedJean-Noel Avila2013-08-111-0/+9668
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/mailmap-updates'Junio C Hamano2013-08-131-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | .mailmap: Combine more (name, email) to individual personssb/mailmap-updatesStefan Beller2013-08-131-1/+3
| * | | | | | | | | | | | .mailmap: update long-lost friends with multiple defunct addressesJunio C Hamano2013-08-131-1/+13
* | | | | | | | | | | | | git-remote-mediawiki: ignore generated git-mwMatthieu Moy2013-08-131-0/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-08-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | parse-options: fix clang opterror() -Wunused-value warningEric Sunshine2013-08-091-1/+1
* | | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2013-08-095-4414/+5144
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | l10n: de.po: translate 5 messagesRalf Thielow2013-08-091-188/+243
| * | | | | | | | | | | | l10n: de.po: translate 99 new messagesRalf Thielow2013-08-091-1638/+1954
| * | | | | | | | | | | | l10n: de.po: switch from pure German to German+EnglishRalf Thielow2013-08-081-922/+909