Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| * | | | | | | | | show_ident_date: fix tz range check | Jeff King | 2014-03-07 | 1 | -2/+2 | |
| * | | | | | | | | log: do not segfault on gmtime errors | Jeff King | 2014-02-24 | 2 | -2/+12 | |
| * | | | | | | | | log: handle integer overflow in timestamps | Jeff King | 2014-02-24 | 2 | -2/+24 | |
| * | | | | | | | | date: check date overflow against time_t | Jeff King | 2014-02-24 | 3 | -1/+19 | |
| * | | | | | | | | fsck: report integer overflow in author timestamps | Jeff King | 2014-02-24 | 2 | -6/+20 | |
| * | | | | | | | | t4212: test bogus timestamps with git-log | Jeff King | 2014-02-24 | 1 | -0/+21 | |
* | | | | | | | | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint | Junio C Hamano | 2014-03-18 | 2 | -3/+32 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktree | Thomas Rast | 2014-02-18 | 2 | -3/+32 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'nd/reset-setup-worktree' into maint | Junio C Hamano | 2014-03-18 | 2 | -3/+15 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktree | Nguyễn Thái Ngọc Duy | 2014-02-18 | 2 | -3/+15 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'jc/check-attr-honor-working-tree' into maint | Junio C Hamano | 2014-03-18 | 2 | -22/+43 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | check-attr: move to the top of working tree when in non-bare repositoryjc/check-attr-honor-working-tree | Junio C Hamano | 2014-02-06 | 2 | -0/+13 | |
| * | | | | | | | | | t0003: do not chdir the whole test process | Junio C Hamano | 2014-02-06 | 1 | -22/+30 | |
* | | | | | | | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint | Junio C Hamano | 2014-03-18 | 4 | -14/+70 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursive | Brad King | 2014-02-24 | 2 | -2/+3 | |
| * | | | | | | | | | | read-cache.c: extend make_cache_entry refresh flag with options | Brad King | 2014-02-24 | 3 | -12/+16 | |
| * | | | | | | | | | | read-cache.c: refactor --ignore-missing implementation | Brad King | 2014-02-24 | 2 | -3/+7 |