Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | worktree list: keep the list sortednd/worktree-list-fixup | Nguyễn Thái Ngọc Duy | 2016-11-28 | 4 | -1/+36 |
* | worktree.c: get_worktrees() takes a new flag argument | Nguyễn Thái Ngọc Duy | 2016-11-28 | 5 | -8/+8 |
* | get_worktrees() must return main worktree as first item even on error | Nguyễn Thái Ngọc Duy | 2016-11-28 | 3 | -9/+28 |
* | worktree: reorder an if statement | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -3/+3 |
* | worktree.c: zero new 'struct worktree' on allocation | Nguyễn Thái Ngọc Duy | 2016-11-23 | 1 | -12/+2 |
* | Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po | Junio C Hamano | 2016-11-22 | 8 | -16103/+23112 |
|\ | |||||
| * | l10n: Fixed typo of git fetch-pack command | Jiang Xin | 2016-11-22 | 6 | -183/+282 |
| * | l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed) | Jiang Xin | 2016-11-22 | 1 | -9/+9 |
| * | Merge branch 'master' of git://github.com/git-l10n/git-po | Jiang Xin | 2016-11-22 | 8 | -16066/+22976 |
| |\ | |||||
| | * | l10n: zh_CN: for git v2.11.0 l10n round 1 | Jiang Xin | 2016-11-21 | 1 | -2002/+2897 |
| | * | l10n: pt_PT: update Portuguese translation | Vasco Almeida | 2016-11-13 | 1 | -2027/+2947 |
| | * | Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git | Jiang Xin | 2016-11-09 | 1 | -2047/+2922 |
| | |\ | |||||
| | | * | l10n: fr.po fix grammar mistakes | jfbu | 2016-11-06 | 1 | -11/+7 |
| | | * | l10n: fr.po v2.11.0_rnd1 | Jean-Noel Avila | 2016-11-05 | 1 | -2037/+2916 |
| | * | | l10n: sv.po: Update Swedish translation (2913t0f0u) | Peter Krefting | 2016-11-05 | 1 | -2019/+2936 |
| | * | | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko | Jiang Xin | 2016-11-05 | 1 | -2230/+2946 |
| | |\ \ | |||||
| | | * | | l10n: ko.po: Update Korean translation | Changwoo Ryu | 2016-11-04 | 1 | -2230/+2946 |
| | * | | | l10n: vi.po: Updated translation to v2.11.0 (2913t) | Tran Ngoc Quan | 2016-11-04 | 1 | -2016/+2930 |
| | |/ / | |||||
| | * | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru | Jiang Xin | 2016-11-02 | 1 | -1773/+2656 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2016-10-16 | 1 | -1773/+2656 |
| | * | | l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed) | Jiang Xin | 2016-11-01 | 1 | -1952/+2742 |
* | | | | Merge branch 'js/prepare-sequencer' | Junio C Hamano | 2016-11-22 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | i18n: fix unmatched single quote in error messagejs/prepare-sequencer | Jiang Xin | 2016-11-21 | 1 | -1/+1 |
* | | | | Git 2.11-rc2v2.11.0-rc2 | Junio C Hamano | 2016-11-17 | 2 | -1/+4 |
* | | | | Merge branch 'tk/diffcore-delta-remove-unused' | Junio C Hamano | 2016-11-17 | 5 | -8/+1 |
|\ \ \ \ | |||||
| * | | | | diffcore-delta: remove unused parameter to diffcore_count_changes()tk/diffcore-delta-remove-unused | Tobias Klauser | 2016-11-14 | 5 | -8/+1 |
* | | | | | Merge branch 'jk/create-branch-remove-unused-param' | Junio C Hamano | 2016-11-17 | 4 | -13/+18 |
|\ \ \ \ \ | |||||
| * | | | | | create_branch: drop unused "head" parameterjk/create-branch-remove-unused-param | Jeff King | 2016-11-09 | 4 | -13/+18 |
* | | | | | | Merge branch 'nd/worktree-lock' | Junio C Hamano | 2016-11-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-worktree.txt: fix typo "to"/"two", and add command/worktree-lock | Ben North | 2016-11-13 | 1 | -1/+1 |
* | | | | | | | Git 2.11.0-rc1v2.11.0-rc1 | Junio C Hamano | 2016-11-11 | 1 | -0/+7 |
* | | | | | | | Merge branch 'rt/fetch-pack-error-message-fix' | Junio C Hamano | 2016-11-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fetch-pack.c: correct command at the beginning of an error messagert/fetch-pack-error-message-fix | Ralf Thielow | 2016-11-11 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ps/common-info-doc' | Junio C Hamano | 2016-11-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: fix location of 'info/' with $GIT_COMMON_DIRps/common-info-doc | Patrick Steinhardt | 2016-11-11 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/pwd-var-vs-pwd-cmd-fix' | Junio C Hamano | 2016-11-11 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variablesjs/pwd-var-vs-pwd-cmd-fix | Johannes Sixt | 2016-11-11 | 2 | -3/+3 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ls/macos-update' | Junio C Hamano | 2016-11-11 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | travis-ci: disable GIT_TEST_HTTPD for macOSls/macos-update | Lars Schneider | 2016-11-10 | 1 | -1/+2 |
| * | | | | | | | | Makefile: set NO_OPENSSL on macOS by default | Lars Schneider | 2016-11-10 | 1 | -0/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/prepare-sequencer' | Junio C Hamano | 2016-11-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | sequencer: silence -Wtautological-constant-out-of-range-compare | Jeff King | 2016-11-08 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-11-11 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t0021: remove debugging cruft | Junio C Hamano | 2016-11-11 | 1 | -2/+1 |
* | | | | | | | | | Merge branch 'as/merge-attr-sleep' | Junio C Hamano | 2016-11-11 | 1 | -5/+13 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleep | Johannes Sixt | 2016-11-11 | 1 | -1/+9 |
| * | | | | | | | | t6026: ensure that long-running script really is | Johannes Schindelin | 2016-11-10 | 1 | -4/+4 |
| * | | | | | | | | Revert "t6026-merge-attr: don't fail if sleep exits early" | Junio C Hamano | 2016-11-10 | 1 | -1/+1 |
| * | | | | | | | | Revert "t6026-merge-attr: ensure that the merge driver was called" | Junio C Hamano | 2016-11-10 | 1 | -2/+1 |
| * | | | | | | | | t6026-merge-attr: ensure that the merge driver was called | Andreas Schwab | 2016-11-10 | 1 | -1/+2 |