Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'et/http-proxyauth' into maint | Junio C Hamano | 2015-07-27 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maint | Junio C Hamano | 2015-07-27 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maint | Junio C Hamano | 2015-07-27 | 2 | -3/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kb/config-unmap-before-renaming' into maint | Junio C Hamano | 2015-07-27 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint | Junio C Hamano | 2015-07-27 | 2 | -1/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maint | Junio C Hamano | 2015-07-27 | 1 | -52/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fix-refresh-utime' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/rebase-am-exit-code' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/index-pack-reduce-recheck' into maint | Junio C Hamano | 2015-07-27 | 3 | -3/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RelNotes: am.threeWay does not exist (yet) | Junio C Hamano | 2015-07-24 | 1 | -2/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "git-am: add am.threeWay config variable" | Junio C Hamano | 2015-07-24 | 4 | -41/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.5.0-rc3v2.5.0-rc3 | Junio C Hamano | 2015-07-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tf/gitweb-typofix' | Junio C Hamano | 2015-07-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: fix typo in man pagetf/gitweb-typofix | Tony Finch | 2015-03-19 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po | Junio C Hamano | 2015-07-21 | 9 | -2680/+3179 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: ca.po: update translation | Alex Henrie | 2015-07-20 | 1 | -187/+204 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/ralfth/git-po-de | Jiang Xin | 2015-07-16 | 1 | -199/+241 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 9 new messages | Ralf Thielow | 2015-07-15 | 1 | -199/+241 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: Updated Bulgarian translation of git (2359t,0f,0u) | Alexander Shopov | 2015-07-15 | 1 | -190/+208 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: zh_CN: for git v2.5.0 l10n round 2 | Jiang Xin | 2015-07-15 | 1 | -199/+201 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: sv.po: Update Swedish translation (2359t0f0u) | Peter Krefting | 2015-07-15 | 1 | -186/+216 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/git | Jiang Xin | 2015-07-15 | 1 | -199/+252 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: fr v2.5.0 round 2 (2359t) | Jean-Noel Avila | 2015-07-14 | 1 | -199/+252 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru | Jiang Xin | 2015-07-14 | 1 | -1120/+1411 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2015-07-14 | 1 | -1120/+1411 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: Updated Vietnamese translation (2359t) | Tran Ngoc Quan | 2015-07-14 | 1 | -218/+247 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed) | Jiang Xin | 2015-07-14 | 1 | -182/+199 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/still-interesting' | Junio C Hamano | 2015-07-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revision.c: remove unneeded check for NULLjk/still-interesting | Stefan Beller | 2015-06-29 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/worktree-add' | Junio C Hamano | 2015-07-17 | 2 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference | Eric Sunshine | 2015-07-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: caution that this is still experimental | Junio C Hamano | 2015-07-16 | 1 | -2/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-worktree: fix stale "git checkout --to" references | Eric Sunshine | 2015-07-16 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with 2.4.6 | Junio C Hamano | 2015-07-15 | 2 | -1/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.4.6v2.4.6 | Junio C Hamano | 2015-07-15 | 4 | -3/+27 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/describe-doc' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/prompt-document-ps1-state-separator' into maint | Junio C Hamano | 2015-07-15 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/osx-header-pollutes-mask-macro' into maint | Junio C Hamano | 2015-07-15 | 4 | -29/+29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/utf8-stupid-compiler-workaround' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fk/doc-format-patch-vn' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pt/t0302-needs-sanity' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'me/fetch-into-shallow-safety' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/fsck-reflog-entries' into maint | Junio C Hamano | 2015-07-15 | 1 | -14/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'af/tcsh-completion-noclobber' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pa/auto-gc-mac-osx' into maint | Junio C Hamano | 2015-07-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint | Junio C Hamano | 2015-07-15 | 2 | -6/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-07-15 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: parse ws-error-highlight option more strictlyjc/diff-ws-error-highlight | René Scharfe | 2015-07-12 | 1 | -1/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-po | Junio C Hamano | 2015-07-13 | 8 | -9106/+11110 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 65 new messages | Ralf Thielow | 2015-07-08 | 1 | -1132/+1391 |