Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/diff-i-t-a' | Junio C Hamano | 2015-06-25 | 2 | -25/+8 |
|\ | |||||
| * | Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-a | Junio C Hamano | 2015-06-23 | 2 | -25/+8 |
* | | Merge branch 'jk/stash-require-clean-index' | Junio C Hamano | 2015-06-24 | 1 | -7/+0 |
|\ \ | |||||
| * | | Revert "stash: require a clean index to apply"jk/stash-require-clean-index | Jeff King | 2015-06-15 | 1 | -7/+0 |
* | | | Merge branch 'pt/t0302-needs-sanity' | Junio C Hamano | 2015-06-24 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanity | Paul Tan | 2015-06-12 | 1 | -1/+1 |
* | | | | Merge branch 'ld/p4-changes-block-size' | Junio C Hamano | 2015-06-24 | 2 | -9/+102 |
|\ \ \ \ | |||||
| * | | | | git-p4: fixing --changes-block-size handlingld/p4-changes-block-size | Luke Diamand | 2015-06-10 | 1 | -6/+6 |
| * | | | | git-p4: add tests for non-numeric revision range | Luke Diamand | 2015-06-10 | 1 | -0/+38 |
| * | | | | git-p4: test with limited p4 server results | Luke Diamand | 2015-06-08 | 1 | -6/+23 |
| * | | | | git-p4: additional testing of --changes-block-size | Luke Diamand | 2015-06-08 | 1 | -9/+47 |
* | | | | | Merge branch 'sg/commit-cleanup-scissors' | Junio C Hamano | 2015-06-24 | 1 | -1/+23 |
|\ \ \ \ \ | |||||
| * | | | | | commit: cope with scissors lines in commit messagesg/commit-cleanup-scissors | SZEDER Gábor | 2015-06-09 | 1 | -1/+23 |
* | | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' | Junio C Hamano | 2015-06-24 | 1 | -0/+56 |
|\ \ \ \ \ \ | |||||
| * | | | | | | read_loose_refs(): treat NULL_SHA1 loose references as brokenmh/reporting-broken-refs-from-for-each-ref | Michael Haggerty | 2015-06-08 | 1 | -1/+1 |
| * | | | | | | for-each-ref: report broken references correctly | Michael Haggerty | 2015-06-02 | 1 | -1/+1 |
| * | | | | | | t6301: new tests of for-each-ref error handling | Michael Haggerty | 2015-06-02 | 1 | -0/+56 |
* | | | | | | | Merge branch 'pt/am-abort-fix' | Junio C Hamano | 2015-06-24 | 1 | -0/+81 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | am --abort: keep unrelated commits on unborn branchpt/am-abort-fix | Paul Tan | 2015-06-08 | 1 | -0/+11 |
| * | | | | | | | am --abort: support aborting to unborn branch | Paul Tan | 2015-06-08 | 1 | -0/+17 |
| * | | | | | | | am --abort: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 | 1 | -0/+23 |
| * | | | | | | | am --skip: support skipping while on unborn branch | Paul Tan | 2015-06-08 | 1 | -0/+10 |
| * | | | | | | | am -3: support 3way merge on unborn branch | Paul Tan | 2015-06-08 | 1 | -0/+9 |
| * | | | | | | | am --skip: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 | 1 | -0/+11 |
* | | | | | | | | Merge branch 'rl/am-3way-config' | Junio C Hamano | 2015-06-24 | 1 | -15/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-am: add am.threeWay config variablerl/am-3way-config | Remi Lespinet | 2015-06-04 | 1 | -0/+19 |
| * | | | | | | | | t4150-am: refactor am -3 tests | Remi Lespinet | 2015-06-04 | 1 | -15/+11 |
* | | | | | | | | | Merge branch 'jc/ll-merge-expose-path' | Junio C Hamano | 2015-06-24 | 1 | -5/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ll-merge: pass the original path to external driversjc/ll-merge-expose-path | Junio C Hamano | 2015-06-04 | 1 | -5/+9 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'pt/pull-optparse' | Junio C Hamano | 2015-06-24 | 2 | -0/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pull: handle git-fetch's options as well | Paul Tan | 2015-06-02 | 2 | -0/+34 |
| * | | | | | | | | | Merge branch 'pt/pull-tests' into pt/pull-optparse | Junio C Hamano | 2015-06-02 | 2 | -36/+175 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'qn/blame-show-email' | Junio C Hamano | 2015-06-24 | 1 | -0/+62 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | blame: add blame.showEmail configurationqn/blame-show-email | Quentin Neill | 2015-06-01 | 1 | -0/+62 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' | Junio C Hamano | 2015-06-24 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marks | Junio C Hamano | 2015-06-01 | 1 | -0/+8 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'es/send-email-sendmail-alias' | Junio C Hamano | 2015-06-24 | 1 | -18/+63 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t9001: add sendmail aliases line continuation tests | Eric Sunshine | 2015-06-01 | 1 | -0/+34 |
| * | | | | | | | | | | | t9001: refactor sendmail aliases test infrastructure | Eric Sunshine | 2015-06-01 | 1 | -18/+29 |
* | | | | | | | | | | | | Merge branch 'jc/apply-reject-noop-hunk' | Junio C Hamano | 2015-06-24 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | apply: reject a hunk that does not do anythingjc/apply-reject-noop-hunk | Junio C Hamano | 2015-06-01 | 1 | -0/+13 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/die-on-bogus-worktree-late' | Junio C Hamano | 2015-06-16 | 1 | -8/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | setup_git_directory: delay core.bare/core.worktree errorsjk/die-on-bogus-worktree-late | Jeff King | 2015-05-29 | 1 | -8/+16 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'ah/send-email-sendmail-alias' | Junio C Hamano | 2015-06-16 | 1 | -1/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | t9001: write $HOME/, not ~/, to help shells without tilde expansionah/send-email-sendmail-alias | Junio C Hamano | 2015-05-27 | 1 | -1/+1 |
| * | | | | | | | | | | | send-email: add sendmail email aliases format | Allen Hubbe | 2015-05-27 | 1 | -0/+27 |
* | | | | | | | | | | | | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' | Junio C Hamano | 2015-06-11 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | silence broken link warnings with revs->ignore_missing_links | Jeff King | 2015-06-01 | 1 | -0/+15 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'pt/pull-tests' | Junio C Hamano | 2015-06-11 | 2 | -36/+175 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | t5520: check reflog action in fast-forward mergept/pull-tests | Paul Tan | 2015-05-29 | 1 | -3/+10 |