aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre2014-03-11
| * | | | | | | merge hook tests: fix missing '&&' in testBenoit Pierre2014-03-11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Start preparing for 1.9.1Junio C Hamano2014-04-03
* | | | | | | Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \
| * | | | | | | mv: prevent mismatched data when ignoring errors.brian m. carlson2014-03-17
| * | | | | | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mh/remove-subtree-long-pathname-fix' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \
| * | | | | | | entry.c: fix possible buffer overflow in remove_subtree()Michael Haggerty2014-03-13
| * | | | | | | checkout_entry(): use the strbuf throughout the functionMichael Haggerty2014-03-13
* | | | | | | | Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \ \
| * | | | | | | | t/lib-terminal: make TTY a lazy prerequisiteJeff King2014-03-14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \ \
| * | | | | | | | index-pack: report error using the correct variableJunio C Hamano2014-03-17
| |/ / / / / / /
* | | | | | | | Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \ \
| * | | | | | | | test-lib.sh: do not "echo" caller-supplied stringsUwe Storbeck2014-03-18
| * | | | | | | | rebase -i: do not "echo" random user-supplied stringsUwe Storbeck2014-03-17
* | | | | | | | | Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/merge-strategies: avoid hyphenated commandsRamkumar Ramachandra2014-03-17
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | shallow: verify shallow file after taking lockJeff King2014-03-17
| * | | | | | | | | shallow: automatically clean up shallow tempfilesJeff King2014-02-27
| * | | | | | | | | shallow: use stat_validity to check for up-to-date fileJeff King2014-02-27
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/stash-pop-not-popped' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash pop: mention we did not drop the stash upon failing to applyJunio C Hamano2014-02-26
* | | | | | | | | | Merge branch 'jn/wt-status' into maintJunio C Hamano2014-04-03
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | wt-status: lift the artificual "at least 20 columns" floorJunio C Hamano2014-03-12
| * | | | | | | | | wt-status: i18n of section labelsJonathan Nieder2014-03-12
| * | | | | | | | | wt-status: extract the code to compute width for labelsJonathan Nieder2014-03-12
| * | | | | | | | | wt-status: make full label string to be subject to l10nJunio C Hamano2014-03-12
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Git 1.9.1v1.9.1Junio C Hamano2014-03-18
* | | | | | | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clean: simplify dir/not-dir logicJeff King2014-03-11
| * | | | | | | | | clean: respect pathspecs with "-d"Jeff King2014-03-11
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'da/difftool-git-files' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t7800: add a difftool test for .git-filesJunio C Hamano2014-03-05
| * | | | | | | | | difftool: support repositories with .git-filesDavid Aguilar2014-02-24
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/remote-pushremote-config-reading' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote: handle pushremote config in any orderJeff King2014-02-24
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | show_ident_date: fix tz range checkJeff King2014-03-07
| * | | | | | | | log: do not segfault on gmtime errorsJeff King2014-02-24
| * | | | | | | | log: handle integer overflow in timestampsJeff King2014-02-24
| * | | | | | | | date: check date overflow against time_tJeff King2014-02-24
| * | | | | | | | fsck: report integer overflow in author timestampsJeff King2014-02-24
| * | | | | | | | t4212: test bogus timestamps with git-logJeff King2014-02-24
* | | | | | | | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: do not reuse_worktree_file for submodulesThomas Rast2014-02-18
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reset: optionally setup worktree and refresh index on --mixedNguyễn Thái Ngọc Duy2014-02-18
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \