Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'nd/diff-i-t-a' | Junio C Hamano | 2015-06-25 |
|\ | |||
| * | Revert "diff-lib.c: adjust position of i-t-a entries in diff" | Junio C Hamano | 2015-06-23 |
* | | Ninth batch for 2.5 | Junio C Hamano | 2015-06-24 |
* | | Merge branch 'jk/stash-require-clean-index' | Junio C Hamano | 2015-06-24 |
|\ \ | |||
| * | | Revert "stash: require a clean index to apply" | Jeff King | 2015-06-15 |
* | | | Merge branch 'pa/auto-gc-mac-osx' | Junio C Hamano | 2015-06-24 |
|\ \ \ | |||
| * | | | hooks/pre-auto-gc: adjust power checking for newer OS X | Panagiotis Astithas | 2015-06-12 |
* | | | | Merge branch 'pt/t0302-needs-sanity' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ | |||
| * | | | | t0302: "unreadable" test needs SANITY prereq | Paul Tan | 2015-06-12 |
* | | | | | Merge branch 'ld/p4-changes-block-size' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ | |||
| * | | | | | git-p4: fixing --changes-block-size handling | Luke Diamand | 2015-06-10 |
| * | | | | | git-p4: add tests for non-numeric revision range | Luke Diamand | 2015-06-10 |
| * | | | | | git-p4: test with limited p4 server results | Luke Diamand | 2015-06-08 |
| * | | | | | git-p4: additional testing of --changes-block-size | Luke Diamand | 2015-06-08 |
* | | | | | | Merge branch 'fk/doc-format-patch-vn' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ | |||
| * | | | | | | doc: format-patch: fix typo | Frans Klaver | 2015-06-10 |
* | | | | | | | Merge branch 'sg/commit-cleanup-scissors' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | commit: cope with scissors lines in commit message | SZEDER Gábor | 2015-06-09 |
* | | | | | | | | Merge branch 'jk/index-pack-reduce-recheck' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | index-pack: avoid excessive re-reading of pack directory | Jeff King | 2015-06-09 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'af/tcsh-completion-noclobber' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-completion.tcsh: fix redirect with noclobber | Ariel Faigon | 2015-06-09 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | read_loose_refs(): treat NULL_SHA1 loose references as broken | Michael Haggerty | 2015-06-08 |
| * | | | | | | | | read_loose_refs(): simplify function logic | Michael Haggerty | 2015-06-03 |
| * | | | | | | | | for-each-ref: report broken references correctly | Michael Haggerty | 2015-06-02 |
| * | | | | | | | | t6301: new tests of for-each-ref error handling | Michael Haggerty | 2015-06-02 |
* | | | | | | | | | Merge branch 'sg/completion-commit-cleanup' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | completion: teach 'scissors' mode to 'git commit --cleanup=' | SZEDER Gábor | 2015-06-08 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'pt/am-abort-fix' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | am --abort: keep unrelated commits on unborn branch | Paul Tan | 2015-06-08 |
| * | | | | | | | | | am --abort: support aborting to unborn branch | Paul Tan | 2015-06-08 |
| * | | | | | | | | | am --abort: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 |
| * | | | | | | | | | am --skip: support skipping while on unborn branch | Paul Tan | 2015-06-08 |
| * | | | | | | | | | am -3: support 3way merge on unborn branch | Paul Tan | 2015-06-08 |
| * | | | | | | | | | am --skip: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | read-cache: fix untracked cache invalidation when split-index is used | Nguyễn Thái Ngọc Duy | 2015-06-08 |
* | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | fsck: report errors if reflog entries point at invalid objects | Michael Haggerty | 2015-06-08 |
| * | | | | | | | | | | fsck_handle_reflog_sha1(): new function | Michael Haggerty | 2015-06-08 |
* | | | | | | | | | | | Merge branch 'js/sleep-without-select' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | lockfile: wait using sleep_millisec() instead of select() | Johannes Sixt | 2015-06-05 |
| * | | | | | | | | | | | lockfile: convert retry timeout computations to millisecond | Johannes Sixt | 2015-06-05 |
| * | | | | | | | | | | | help.c: wrap wait-only poll() invocation in sleep_millisec() | Johannes Sixt | 2015-06-05 |
| * | | | | | | | | | | | lockfile: replace random() by rand() | Johannes Sixt | 2015-06-05 |
* | | | | | | | | | | | | Merge branch 'es/utf8-stupid-compiler-workaround' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | utf8: NO_ICONV: silence uninitialized variable warning | Eric Sunshine | 2015-06-05 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'rl/am-3way-config' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | git-am: add am.threeWay config variable | Remi Lespinet | 2015-06-04 |