summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-07-24RelNotes: am.threeWay does not exist (yet)Libravatar Junio C Hamano1-2/+0
2015-07-24Revert "git-am: add am.threeWay config variable"Libravatar Junio C Hamano4-41/+2
2015-07-21Git 2.5.0-rc3Libravatar Junio C Hamano1-1/+1
2015-07-21Merge branch 'tf/gitweb-typofix'Libravatar Junio C Hamano1-1/+1
2015-07-21Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano9-2680/+3179
2015-07-20l10n: ca.po: update translationLibravatar Alex Henrie1-187/+204
2015-07-17Merge branch 'jk/still-interesting'Libravatar Junio C Hamano1-2/+2
2015-07-17Merge branch 'es/worktree-add'Libravatar Junio C Hamano2-5/+6
2015-07-17Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" referenceLibravatar Eric Sunshine1-1/+1
2015-07-16worktree: caution that this is still experimentalLibravatar Junio C Hamano1-2/+3
2015-07-16Documentation/git-worktree: fix stale "git checkout --to" referencesLibravatar Eric Sunshine1-2/+2
2015-07-16Merge branch 'master' of https://github.com/ralfth/git-po-deLibravatar Jiang Xin1-199/+241
2015-07-15Sync with 2.4.6Libravatar Junio C Hamano2-1/+25
2015-07-15Git 2.4.6Libravatar Junio C Hamano4-3/+27
2015-07-15Merge branch 'jc/diff-ws-error-highlight'Libravatar Junio C Hamano1-1/+6
2015-07-15Merge branch 'mm/describe-doc' into maintLibravatar Junio C Hamano1-1/+1
2015-07-15Merge branch 'jc/prompt-document-ps1-state-separator' into maintLibravatar Junio C Hamano1-0/+4
2015-07-15Merge branch 'es/osx-header-pollutes-mask-macro' into maintLibravatar Junio C Hamano4-29/+29
2015-07-15Merge branch 'es/utf8-stupid-compiler-workaround' into maintLibravatar Junio C Hamano1-1/+3
2015-07-15Merge branch 'fk/doc-format-patch-vn' into maintLibravatar Junio C Hamano1-1/+1
2015-07-15Merge branch 'pt/t0302-needs-sanity' into maintLibravatar Junio C Hamano1-1/+1
2015-07-15Merge branch 'me/fetch-into-shallow-safety' into maintLibravatar Junio C Hamano1-1/+1
2015-07-15Merge branch 'mh/fsck-reflog-entries' into maintLibravatar Junio C Hamano1-14/+20
2015-07-15Merge branch 'af/tcsh-completion-noclobber' into maintLibravatar Junio C Hamano1-1/+1
2015-07-15Merge branch 'pa/auto-gc-mac-osx' into maintLibravatar Junio C Hamano1-1/+1
2015-07-15Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintLibravatar Junio C Hamano2-6/+14
2015-07-15l10n: de.po: translate 9 new messagesLibravatar Ralf Thielow1-199/+241
2015-07-15l10n: Updated Bulgarian translation of git (2359t,0f,0u)Libravatar Alexander Shopov1-190/+208
2015-07-15l10n: zh_CN: for git v2.5.0 l10n round 2Libravatar Jiang Xin1-199/+201
2015-07-15l10n: sv.po: Update Swedish translation (2359t0f0u)Libravatar Peter Krefting1-186/+216
2015-07-15Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/gitLibravatar Jiang Xin1-199/+252
2015-07-14l10n: fr v2.5.0 round 2 (2359t)Libravatar Jean-Noel Avila1-199/+252
2015-07-14Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruLibravatar Jiang Xin1-1120/+1411
2015-07-14l10n: ru.po: update Russian translationLibravatar Dimitriy Ryazantcev1-1120/+1411
2015-07-14l10n: Updated Vietnamese translation (2359t)Libravatar Tran Ngoc Quan1-218/+247
2015-07-14l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)Libravatar Jiang Xin1-182/+199
2015-07-13Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano8-9106/+11110
2015-07-13Git 2.5.0-rc2Libravatar Junio C Hamano2-3/+45
2015-07-13Merge branch 'es/worktree-add'Libravatar Junio C Hamano8-260/+386
2015-07-13Merge branch 'nd/multiple-work-trees'Libravatar Junio C Hamano13-126/+217
2015-07-13Merge branch 'ss/clone-guess-dir-name-simplify'Libravatar Junio C Hamano1-13/+6
2015-07-13Merge branch 'kb/config-unmap-before-renaming'Libravatar Junio C Hamano1-0/+3
2015-07-13Merge branch 'mh/strbuf-read-file-returns-ssize-t'Libravatar Junio C Hamano2-3/+4
2015-07-13Merge branch 'jc/unexport-git-pager-in-use-in-pager'Libravatar Junio C Hamano1-0/+1
2015-07-13Merge branch 'kb/use-nsec-doc'Libravatar Junio C Hamano2-6/+11
2015-07-13Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Libravatar Junio C Hamano2-1/+26
2015-07-13Merge branch 'et/http-proxyauth'Libravatar Junio C Hamano1-2/+2
2015-07-13Merge branch 'jc/fsck-retire-require-eoh'Libravatar Junio C Hamano1-4/+13
2015-07-12diff: parse ws-error-highlight option more strictlyLibravatar René Scharfe1-1/+6
2015-07-12Revert "checkout: retire --ignore-other-worktrees in favor of --force"Libravatar Junio C Hamano3-7/+12