Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'jk/prune-with-corrupt-refs' | Junio C Hamano | 2015-03-25 | 1 | -0/+114 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | refs.c: drop curate_packed_refsjk/prune-with-corrupt-refs | Jeff King | 2015-03-20 | 1 | -1/+1 | |
| * | | | | | | repack: turn on "ref paranoia" when doing a destructive repack | Jeff King | 2015-03-20 | 1 | -1/+1 | |
| * | | | | | | prune: turn on ref_paranoia flag | Jeff King | 2015-03-20 | 1 | -2/+2 | |
| * | | | | | | t5312: test object deletion code paths in a corrupted repository | Jeff King | 2015-03-20 | 1 | -0/+114 | |
| * | | | | | | Merge branch 'ak/t5516-typofix' into maint | Junio C Hamano | 2015-03-13 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'jc/diff-test-updates' into maint | Junio C Hamano | 2015-03-13 | 11 | -175/+550 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/diffcore-rename-duplicate' into maint | Junio C Hamano | 2015-03-13 | 1 | -0/+79 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'mk/diff-shortstat-dirstat-fix' into maint | Junio C Hamano | 2015-03-13 | 1 | -0/+14 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-beyond-symlink' into maint | Junio C Hamano | 2015-03-13 | 2 | -0/+247 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/daemon-interpolate' into maint | Junio C Hamano | 2015-03-13 | 1 | -0/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fetch-pack' | Junio C Hamano | 2015-03-25 | 1 | -3/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | filter_ref: make a copy of extra "sought" entries | Jeff King | 2015-03-19 | 1 | -3/+10 | |
* | | | | | | | | | | | | | | Merge branch 'dj/log-graph-with-no-walk' | Junio C Hamano | 2015-03-25 | 4 | -7/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | revision: forbid combining --graph and --no-walkdj/log-graph-with-no-walk | Dongcan Jiang | 2015-03-19 | 4 | -7/+19 | |
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'kd/rev-list-bisect-first-parent' | Junio C Hamano | 2015-03-25 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | rev-list: refuse --first-parent combined with --bisectkd/rev-list-bisect-first-parent | Kevin Daudt | 2015-03-19 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | Merge branch 'ct/prompt-untracked-fix' | Junio C Hamano | 2015-03-25 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | git prompt: use toplevel to find untracked filesct/prompt-untracked-fix | Cody A Taylor | 2015-03-15 | 1 | -0/+11 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/test-annoyances' | Junio C Hamano | 2015-03-23 | 5 | -15/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | t5551: make EXPENSIVE test cheaperjk/test-annoyances | Jeff King | 2015-03-12 | 1 | -5/+14 | |
| * | | | | | | | | | | | | | | | t5541: move run_with_cmdline_limit to test-lib.sh | Jeff King | 2015-03-12 | 2 | -6/+6 | |
| * | | | | | | | | | | | | | | | t: pass GIT_TRACE through Apache | Jeff King | 2015-03-12 | 2 | -0/+2 | |
| * | | | | | | | | | | | | | | | t: redirect stderr GIT_TRACE to descriptor 4 | Jeff King | 2015-03-12 | 1 | -4/+1 | |
| * | | | | | | | | | | | | | | | t: translate SIGINT to an exit | Jeff King | 2015-03-12 | 1 | -0/+1 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/smart-http-hide-refs' | Junio C Hamano | 2015-03-23 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | upload-pack: fix transfer.hiderefs over smart-http | Jeff King | 2015-03-12 | 1 | -0/+11 | |
* | | | | | | | | | | | | | | | | Merge branch 'mg/log-decorate-HEAD' | Junio C Hamano | 2015-03-20 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | log: decorate HEAD with branch name | Junio C Hamano | 2015-03-10 | 2 | -4/+4 | |
| * | | | | | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color' into HEAD | Junio C Hamano | 2015-03-10 | 1 | -8/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color' | Junio C Hamano | 2015-03-20 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-color | Junio C Hamano | 2015-03-04 | 1 | -8/+8 | |
* | | | | | | | | | | | | | | | | | Merge branch 'mg/verify-commit' | Junio C Hamano | 2015-03-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | t7510: do not fail when gpg warns about insecure memorymg/verify-commit | Kyle J. McKay | 2015-03-10 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'km/bsd-shells' | Junio C Hamano | 2015-03-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | t5528: do not fail with FreeBSD shellkm/bsd-shells | Kyle J. McKay | 2015-03-10 | 1 | -2/+2 | |
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'km/send-email-getopt-long-workarounds' into maint | Junio C Hamano | 2015-03-06 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/merge-file-prefix' into maint | Junio C Hamano | 2015-03-05 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/submodule-sanitize-path-upon-add' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/prune-mtime' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ch/new-gpg-drops-rfc-1991' into maint | Junio C Hamano | 2015-03-05 | 2 | -0/+58 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/config-no-ungetc-eof' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/deref-symref-over-helper-transport' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/rebase-i-abbrev' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/sanity' into maint | Junio C Hamano | 2015-03-05 | 4 | -9/+42 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+121 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/dumb-http-idx-fetch-fix' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dk/format-patch-ignore-diff-submodule' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/detached-head-report' | Junio C Hamano | 2015-03-20 | 1 | -1/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: name detached HEAD analogous to statusmg/detached-head-report | Michael J Gruber | 2015-03-06 | 1 | -1/+38 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |