summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* reset: trivial style cleanupFelipe Contreras2013-08-301-1/+1
* branch: trivial style fixFelipe Contreras2013-08-301-1/+1
* reset: trivial refactoringFelipe Contreras2013-08-301-6/+3
* Start the post-1.8.4 cycleJunio C Hamano2013-08-303-2/+88
* Merge branch 'bc/completion-for-bash-3.0'Junio C Hamano2013-08-303-3/+7
|\
| * contrib/git-prompt.sh: handle missing 'printf -v' more gracefullybc/completion-for-bash-3.0Brandon Casey2013-08-221-1/+5
| * t9902-completion.sh: old Bash still does not support array+=('') notationBrandon Casey2013-08-211-1/+1
| * git-completion.bash: use correct Bash/Zsh array length syntaxBrandon Casey2013-08-211-1/+1
* | Merge branch 'sp/doc-smart-http'Junio C Hamano2013-08-301-0/+503
|\ \
| * | Document the HTTP transport protocolssp/doc-smart-httpShawn O. Pearce2013-08-211-0/+503
| |/
* | Merge branch 'mm/war-on-whatchanged'Junio C Hamano2013-08-305-70/+54
|\ \
| * | whatchanged: document its historical naturemm/war-on-whatchangedJunio C Hamano2013-08-131-33/+7
| * | core-tutorial: trim the section on Inspecting ChangesJunio C Hamano2013-08-134-37/+47
* | | Merge branch 'rt/doc-merge-file-diff3'Junio C Hamano2013-08-301-1/+4
|\ \ \
| * | | Documentation/git-merge-file: document option "--diff3"rt/doc-merge-file-diff3Ralf Thielow2013-08-091-1/+4
* | | | Merge branch 'mb/docs-favor-en-us'Junio C Hamano2013-08-302-1/+22
|\ \ \ \
| * | | | Provide some linguistic guidance for the documentation.mb/docs-favor-en-usMarc Branchaud2013-08-012-1/+22
* | | | | Merge branch 'rj/doc-rev-parse'Junio C Hamano2013-08-302-55/+77
|\ \ \ \ \
| * | | | | rev-parse(1): logically group optionsrj/doc-rev-parseJohn Keeping2013-07-221-40/+64
| * | | | | rev-parse: remove restrictions on some optionsJohn Keeping2013-07-221-15/+13
* | | | | | Merge branch 'hv/config-from-blob'Junio C Hamano2013-08-301-16/+16
|\ \ \ \ \ \
| * | | | | | config: do not use C function names as struct membershv/config-from-blobJeff King2013-08-261-16/+16
* | | | | | | Merge branch 'nd/fetch-pack-shallow-fix'Junio C Hamano2013-08-302-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
| | |_|_|/ / / | |/| | | | |
* | | | | | | 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