summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remote: add get-url subcommandbb/remote-get-urlBen Boeckel2015-09-173-0/+106
* Git 2.5v2.5.0js/rev-stdin-with-crlfJunio C Hamano2015-07-272-1/+6
* Sync with 2.4.7Junio C Hamano2015-07-272-1/+55
|\
| * Git 2.4.7v2.4.7Junio C Hamano2015-07-274-3/+57
| * Merge branch 'jk/pretty-encoding-doc' into maintJunio C Hamano2015-07-271-1/+4
| |\
| * \ Merge branch 'tb/checkout-doc' into maintJunio C Hamano2015-07-271-1/+5
| |\ \
| * \ \ Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2015-07-272-0/+2
| |\ \ \
| * \ \ \ Merge branch 'mm/branch-doc-updates' into maintJunio C Hamano2015-07-271-2/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/fsck-retire-require-eoh' into maintJunio C Hamano2015-07-271-4/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'et/http-proxyauth' into maintJunio C Hamano2015-07-271-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maintJunio C Hamano2015-07-271-0/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maintJunio C Hamano2015-07-272-3/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'kb/config-unmap-before-renaming' into maintJunio C Hamano2015-07-271-0/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-272-1/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintJunio C Hamano2015-07-271-52/+47
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-refresh-utime' into maintJunio C Hamano2015-07-271-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/rebase-am-exit-code' into maintJunio C Hamano2015-07-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-reduce-recheck' into maintJunio C Hamano2015-07-273-3/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | RelNotes: am.threeWay does not exist (yet)Junio C Hamano2015-07-241-2/+0
* | | | | | | | | | | | | | | | Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-244-41/+2
* | | | | | | | | | | | | | | | Git 2.5.0-rc3v2.5.0-rc3Junio C Hamano2015-07-211-1/+1
* | | | | | | | | | | | | | | | Merge branch 'tf/gitweb-typofix'Junio C Hamano2015-07-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | gitweb: fix typo in man pagetf/gitweb-typofixTony Finch2015-03-191-1/+1
* | | | | | | | | | | | | | | | | Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2015-07-219-2680/+3179
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | l10n: ca.po: update translationAlex Henrie2015-07-201-187/+204
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin2015-07-161-199/+241
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | l10n: de.po: translate 9 new messagesRalf Thielow2015-07-151-199/+241
| * | | | | | | | | | | | | | | | | | l10n: Updated Bulgarian translation of git (2359t,0f,0u)Alexander Shopov2015-07-151-190/+208
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | l10n: zh_CN: for git v2.5.0 l10n round 2Jiang Xin2015-07-151-199/+201
| * | | | | | | | | | | | | | | | | l10n: sv.po: Update Swedish translation (2359t0f0u)Peter Krefting2015-07-151-186/+216
| * | | | | | | | | | | | | | | | | Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/gitJiang Xin2015-07-151-199/+252
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | l10n: fr v2.5.0 round 2 (2359t)Jean-Noel Avila2015-07-141-199/+252
| * | | | | | | | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2015-07-141-1120/+1411
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2015-07-141-1120/+1411
| | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | l10n: Updated Vietnamese translation (2359t)Tran Ngoc Quan2015-07-141-218/+247
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)Jiang Xin2015-07-141-182/+199
* | | | | | | | | | | | | | | | | | Merge branch 'jk/still-interesting'Junio C Hamano2015-07-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | revision.c: remove unneeded check for NULLjk/still-interestingStefan Beller2015-06-291-2/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-07-172-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" referenceEric Sunshine2015-07-171-1/+1
| * | | | | | | | | | | | | | | | | | | worktree: caution that this is still experimentalJunio C Hamano2015-07-161-2/+3
| * | | | | | | | | | | | | | | | | | | Documentation/git-worktree: fix stale "git checkout --to" referencesEric Sunshine2015-07-161-2/+2
* | | | | | | | | | | | | | | | | | | | Sync with 2.4.6Junio C Hamano2015-07-152-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Git 2.4.6v2.4.6Junio C Hamano2015-07-154-3/+27
| * | | | | | | | | | | | | | | | | | | Merge branch 'mm/describe-doc' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/prompt-document-ps1-state-separator' into maintJunio C Hamano2015-07-151-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/osx-header-pollutes-mask-macro' into maintJunio C Hamano2015-07-154-29/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/utf8-stupid-compiler-workaround' into maintJunio C Hamano2015-07-151-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fk/doc-format-patch-vn' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano2015-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \