summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-111-0/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mh/remove-subtree-long-pathname-fix' into maintJunio C Hamano2014-04-031-32/+32
|\ \ \ \ \ \ \
| * | | | | | | entry.c: fix possible buffer overflow in remove_subtree()mh/remove-subtree-long-pathname-fixMichael Haggerty2014-03-131-17/+17
| * | | | | | | checkout_entry(): use the strbuf throughout the functionMichael Haggerty2014-03-131-16/+16
* | | | | | | | Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano2014-04-031-18/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | t/lib-terminal: make TTY a lazy prerequisitejk/lib-terminal-lazyJeff King2014-03-141-18/+19
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-031-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | index-pack: report error using the correct variablend/index-pack-error-messageJunio C Hamano2014-03-171-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-032-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | test-lib.sh: do not "echo" caller-supplied stringsus/printf-not-echoUwe Storbeck2014-03-181-2/+2
| * | | | | | | | rebase -i: do not "echo" random user-supplied stringsUwe Storbeck2014-03-171-1/+1
* | | | | | | | | Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano2014-04-031-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/merge-strategies: avoid hyphenated commandsrr/doc-merge-strategiesRamkumar Ramachandra2014-03-171-2/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-035-56/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | shallow: verify shallow file after taking lockjk/shallow-update-fixJeff King2014-03-171-2/+2
| * | | | | | | | | shallow: automatically clean up shallow tempfilesJeff King2014-02-275-37/+40
| * | | | | | | | | shallow: use stat_validity to check for up-to-date fileJeff King2014-02-271-17/+7
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/stash-pop-not-popped' into maintJunio C Hamano2014-04-031-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash pop: mention we did not drop the stash upon failing to applyjc/stash-pop-not-poppedJunio C Hamano2014-02-261-2/+8
* | | | | | | | | | Merge branch 'jn/wt-status' into maintJunio C Hamano2014-04-033-55/+88
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | wt-status: lift the artificual "at least 20 columns" floorjn/wt-statusJunio C Hamano2014-03-123-15/+13
| * | | | | | | | | wt-status: i18n of section labelsJonathan Nieder2014-03-121-19/+47
| * | | | | | | | | wt-status: extract the code to compute width for labelsJonathan Nieder2014-03-121-7/+15
| * | | | | | | | | wt-status: make full label string to be subject to l10nJunio C Hamano2014-03-121-18/+17
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Git 1.9.1v1.9.1Junio C Hamano2014-03-184-3/+63
* | | | | | | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-182-11/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clean: simplify dir/not-dir logicjk/clean-d-pathspecJeff King2014-03-111-9/+6
| * | | | | | | | | clean: respect pathspecs with "-d"Jeff King2014-03-112-2/+19
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'da/difftool-git-files' into maintJunio C Hamano2014-03-182-16/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t7800: add a difftool test for .git-filesda/difftool-git-filesJunio C Hamano2014-03-051-0/+14
| * | | | | | | | | difftool: support repositories with .git-filesDavid Aguilar2014-02-241-16/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/remote-pushremote-config-reading' into maintJunio C Hamano2014-03-182-1/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote: handle pushremote config in any orderjk/remote-pushremote-config-readingJeff King2014-02-242-1/+19
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-03-186-11/+96
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | show_ident_date: fix tz range checkJeff King2014-03-071-2/+2
| * | | | | | | | log: do not segfault on gmtime errorsJeff King2014-02-242-2/+12
| * | | | | | | | log: handle integer overflow in timestampsJeff King2014-02-242-2/+24
| * | | | | | | | date: check date overflow against time_tJeff King2014-02-243-1/+19
| * | | | | | | | fsck: report integer overflow in author timestampsJeff King2014-02-242-6/+20
| * | | | | | | | t4212: test bogus timestamps with git-logJeff King2014-02-241-0/+21
* | | | | | | | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-182-3/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktreeThomas Rast2014-02-182-3/+32
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-182-3/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktreeNguyễn Thái Ngọc Duy2014-02-182-3/+15
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-182-22/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | check-attr: move to the top of working tree when in non-bare repositoryjc/check-attr-honor-working-treeJunio C Hamano2014-02-062-0/+13
| * | | | | | | | | t0003: do not chdir the whole test processJunio C Hamano2014-02-061-22/+30
* | | | | | | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-184-14/+70
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursiveBrad King2014-02-242-2/+3
| * | | | | | | | | | read-cache.c: extend make_cache_entry refresh flag with optionsBrad King2014-02-243-12/+16