Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge commit 'doc/http-backend: missing accent grave in literal mark-up' | Junio C Hamano | 2014-04-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | doc/http-backend: missing accent grave in literal mark-up | Thomas Ackermann | 2014-04-09 | 1 | -1/+1 | |
* | | | | | | | | Update draft release notes to 1.9.2 | Junio C Hamano | 2014-04-08 | 1 | -0/+9 | |
* | | | | | | | | Merge branch 'mm/status-porcelain-format-i18n-fix' into maint | Junio C Hamano | 2014-04-08 | 2 | -5/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | status: disable translation when --porcelain is usedmm/status-porcelain-format-i18n-fix | Matthieu Moy | 2014-03-26 | 2 | -5/+9 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'bp/commit-p-editor' into maint | Junio C Hamano | 2014-04-08 | 10 | -39/+137 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | run-command: mark run_hook_with_custom_index as deprecatedbp/commit-p-editor | Benoit Pierre | 2014-03-18 | 1 | -0/+1 | |
| * | | | | | | | | merge hook tests: fix and update tests | Benoit Pierre | 2014-03-18 | 1 | -6/+21 | |
| * | | | | | | | | merge: fix GIT_EDITOR override for commit hook | Benoit Pierre | 2014-03-18 | 1 | -1/+1 | |
| * | | | | | | | | commit: fix patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | 9 | -32/+80 | |
| * | | | | | | | | test patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | 1 | -0/+34 | |
| * | | | | | | | | merge hook tests: use 'test_must_fail' instead of '!' | Benoit Pierre | 2014-03-11 | 1 | -2/+2 | |
| * | | | | | | | | merge hook tests: fix missing '&&' in test | Benoit Pierre | 2014-03-11 | 1 | -1/+1 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Start preparing for 1.9.1 | Junio C Hamano | 2014-04-03 | 2 | -1/+39 | |
* | | | | | | | | Merge branch 'jk/mv-submodules-fix' into maint | Junio C Hamano | 2014-04-03 | 2 | -1/+21 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fix | brian m. carlson | 2014-03-17 | 2 | -1/+17 | |
| * | | | | | | | | builtin/mv: fix out of bounds write | John Keeping | 2014-03-11 | 1 | -0/+4 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'mh/remove-subtree-long-pathname-fix' into maint | Junio C Hamano | 2014-04-03 | 1 | -32/+32 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | entry.c: fix possible buffer overflow in remove_subtree()mh/remove-subtree-long-pathname-fix | Michael Haggerty | 2014-03-13 | 1 | -17/+17 | |
| * | | | | | | | | checkout_entry(): use the strbuf throughout the function | Michael Haggerty | 2014-03-13 | 1 | -16/+16 | |
* | | | | | | | | | Merge branch 'jk/lib-terminal-lazy' into maint | Junio C Hamano | 2014-04-03 | 1 | -18/+19 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | t/lib-terminal: make TTY a lazy prerequisitejk/lib-terminal-lazy | Jeff King | 2014-03-14 | 1 | -18/+19 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'nd/index-pack-error-message' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | index-pack: report error using the correct variablend/index-pack-error-message | Junio C Hamano | 2014-03-17 | 1 | -2/+2 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'us/printf-not-echo' into maint | Junio C Hamano | 2014-04-03 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | test-lib.sh: do not "echo" caller-supplied stringsus/printf-not-echo | Uwe Storbeck | 2014-03-18 | 1 | -2/+2 | |
| * | | | | | | | | | rebase -i: do not "echo" random user-supplied strings | Uwe Storbeck | 2014-03-17 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'rr/doc-merge-strategies' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Documentation/merge-strategies: avoid hyphenated commandsrr/doc-merge-strategies | Ramkumar Ramachandra | 2014-03-17 | 1 | -2/+2 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jk/shallow-update-fix' into maint | Junio C Hamano | 2014-04-03 | 5 | -56/+49 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | shallow: verify shallow file after taking lockjk/shallow-update-fix | Jeff King | 2014-03-17 | 1 | -2/+2 | |
| * | | | | | | | | | | shallow: automatically clean up shallow tempfiles | Jeff King | 2014-02-27 | 5 | -37/+40 | |
| * | | | | | | | | | | shallow: use stat_validity to check for up-to-date file | Jeff King | 2014-02-27 | 1 | -17/+7 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jc/stash-pop-not-popped' into maint | Junio C Hamano | 2014-04-03 | 1 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | stash pop: mention we did not drop the stash upon failing to applyjc/stash-pop-not-popped | Junio C Hamano | 2014-02-26 | 1 | -2/+8 | |
* | | | | | | | | | | | Merge branch 'jn/wt-status' into maint | Junio C Hamano | 2014-04-03 | 3 | -55/+88 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | wt-status: lift the artificual "at least 20 columns" floorjn/wt-status | Junio C Hamano | 2014-03-12 | 3 | -15/+13 | |
| * | | | | | | | | | | wt-status: i18n of section labels | Jonathan Nieder | 2014-03-12 | 1 | -19/+47 | |
| * | | | | | | | | | | wt-status: extract the code to compute width for labels | Jonathan Nieder | 2014-03-12 | 1 | -7/+15 | |
| * | | | | | | | | | | wt-status: make full label string to be subject to l10n | Junio C Hamano | 2014-03-12 | 1 | -18/+17 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Git 1.9.1v1.9.1 | Junio C Hamano | 2014-03-18 | 4 | -3/+63 | |
* | | | | | | | | | | Merge branch 'jk/clean-d-pathspec' into maint | Junio C Hamano | 2014-03-18 | 2 | -11/+25 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | clean: simplify dir/not-dir logicjk/clean-d-pathspec | Jeff King | 2014-03-11 | 1 | -9/+6 | |
| * | | | | | | | | | | clean: respect pathspecs with "-d" | Jeff King | 2014-03-11 | 2 | -2/+19 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'da/difftool-git-files' into maint | Junio C Hamano | 2014-03-18 | 2 | -16/+16 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | t7800: add a difftool test for .git-filesda/difftool-git-files | Junio C Hamano | 2014-03-05 | 1 | -0/+14 | |
| * | | | | | | | | | | difftool: support repositories with .git-files | David Aguilar | 2014-02-24 | 1 | -16/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'jk/remote-pushremote-config-reading' into maint | Junio C Hamano | 2014-03-18 | 2 | -1/+19 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remote: handle pushremote config in any orderjk/remote-pushremote-config-reading | Jeff King | 2014-02-24 | 2 | -1/+19 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-03-18 | 6 | -11/+96 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | |