summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow git-filter-branch to process large repositories with lots of branches.lc/filter-branch-too-many-refsLee Carver2013-09-121-2/+2
* 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
| * | | | | l10n: de.po: Fix a typoWieland Hoffmann2013-08-081-1/+1
| * | | | | l10n: Update Swedish translation (2135t0f0u)Peter Krefting2013-08-061-1521/+1844
| * | | | | l10n: zh_CN.po: translate 5 messages (2135t0f0u)Jiang Xin2013-08-061-164/+182
| * | | | | l10n: vi.po(2135t): v1.8.4 round 2Tran Ngoc Quan2013-08-061-169/+187
| * | | | | l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)Jiang Xin2013-08-061-161/+174
* | | | | | Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-08-091-1/+1
|\ \ \ \ \ \
| * | | | | | t/t7407: fix two typos in submodule testsjk/submodule-subdirectory-okPhil Hord2013-08-091-1/+1
* | | | | | | Merge branch 'sb/mailmap-updates'Junio C Hamano2013-08-091-2/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | .mailmap: fixup entriesStefan Beller2013-08-091-2/+7
* | | | | | | Git 1.8.4-rc2v1.8.4-rc2Junio C Hamano2013-08-082-1/+8
| |_|/ / / / |/| | | | |
* | | | | | Sync with maint to grab trivial doc fixesJunio C Hamano2013-08-054-4/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | fix typo in documentation of git-svnFelix Gruber2013-08-051-1/+1
| * | | | | Documentation/rev-list-options: add missing word in --*-parentsTorstein Hegge2013-08-051-1/+1
| * | | | | log doc: the argument to --encoding is not optionalJonathan Nieder2013-08-052-2/+2
* | | | | | Merge branch 'es/blame-L-breakage'Junio C Hamano2013-08-051-2/+2
|\ \ \ \ \ \
| * | | | | | t8001, t8002: fix "blame -L :literal" test on NetBSDes/blame-L-breakageRené Scharfe2013-08-051-2/+2
* | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-08-053-4352/+5403
|\ \ \ \ \ \ \
| * | | | | | | l10n: zh_CN.po: translate 99 messages (2133t0f0u)Jiang Xin2013-08-031-1449/+1851