Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -4/+4 |
|\ | |||||
| * | log -L: improve error message on malformed argumentmm/usage-log-l-can-take-regex | Matthieu Moy | 2015-04-20 | 1 | -4/+4 |
* | | Merge branch 'jc/diff-no-index-d-f' into maint-2.3 | Junio C Hamano | 2015-05-11 | 1 | -0/+34 |
|\ \ | |||||
| * | | diff-no-index: align D/F handling with that of normal Gitjc/diff-no-index-d-f | Junio C Hamano | 2015-03-26 | 1 | -0/+12 |
| * | | diff-no-index: DWIM "diff D F" into "diff D/F F" | Junio C Hamano | 2015-03-25 | 1 | -0/+22 |
* | | | Merge branch 'tb/connect-ipv6-parse-fix' into maint | Junio C Hamano | 2015-04-27 | 2 | -16/+22 |
|\ \ \ | |||||
| * | | | connect.c: ignore extra colon after hostnametb/connect-ipv6-parse-fix | Torsten Bögershausen | 2015-04-08 | 2 | -16/+22 |
* | | | | Merge branch 'jk/test-annoyances' into maint | Junio C Hamano | 2015-04-21 | 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 'tg/test-index-v4' into maint | Junio C Hamano | 2015-03-28 | 1 | -3/+12 |
|\ \ \ \ | |||||
| * | | | | t1700: make test pass with index-v4tg/test-index-v4 | Thomas Gummerer | 2015-03-20 | 1 | -3/+12 |
* | | | | | Merge branch 'ct/prompt-untracked-fix' into maint | Junio C Hamano | 2015-03-28 | 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/fetch-pack' into maint | Junio C Hamano | 2015-03-28 | 1 | -3/+10 |
|\ \ \ \ \ | |||||
| * | | | | | filter_ref: make a copy of extra "sought" entries | Jeff King | 2015-03-19 | 1 | -3/+10 |
* | | | | | | Merge branch 'jk/prune-with-corrupt-refs' into maint | Junio C Hamano | 2015-03-28 | 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 'jk/smart-http-hide-refs' into maint | Junio C Hamano | 2015-03-27 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | upload-pack: fix transfer.hiderefs over smart-http | Jeff King | 2015-03-12 | 1 | -0/+11 |
* | | | | | | | | Merge branch 'sg/completion-remote' into maint | Junio C Hamano | 2015-03-23 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | completion: add a test for __git_remotes() helper function | SZEDER Gábor | 2015-03-06 | 1 | -0/+19 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color' into maint | Junio C Hamano | 2015-03-23 | 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 'kn/git-cd-to-empty' into maint | Junio C Hamano | 2015-03-23 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git: treat "git -C '<path>'" as a no-op when <path> is emptykn/git-cd-to-empty | Karthik Nayak | 2015-03-06 | 1 | -0/+10 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mg/verify-commit' into maint | Junio C Hamano | 2015-03-23 | 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 'es/rebase-i-count-todo' into maint | Junio C Hamano | 2015-03-23 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rebase-interactive: suppress whitespace preceding item count | Eric Sunshine | 2015-03-06 | 1 | -0/+9 |
* | | | | | | | | | | | Merge branch 'tb/connect-ipv6-parse-fix' into maint | Junio C Hamano | 2015-03-23 | 2 | -36/+74 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | t5500: show user name and host in diag-url | Torsten Bögershausen | 2015-02-22 | 1 | -18/+33 |
| * | | | | | | | | | t5601: add more test cases for IPV6 | Torsten Bögershausen | 2015-02-22 | 1 | -17/+40 |
| * | | | | | | | | | connect.c: allow ssh://user@[2001:db8::1]/repo.git | Torsten Bögershausen | 2015-02-22 | 1 | -1/+1 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ak/t5516-typofix' into maint | Junio C Hamano | 2015-03-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5516: correct misspelled pushInsteadOfak/t5516-typofix | Anders Kaseorg | 2015-03-03 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/diff-test-updates' into maint | Junio C Hamano | 2015-03-13 | 11 | -175/+550 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | test_ln_s_add: refresh stat info of fake symbolic linksjc/diff-test-updates | Johannes Sixt | 2015-02-23 | 1 | -1/+3 |
| * | | | | | | | | | t4008: modernise style | Junio C Hamano | 2015-02-15 | 1 | -160/+126 |
| * | | | | | | | | | t/diff-lib: check exact object names in compare_diff_raw | Junio C Hamano | 2015-02-15 | 1 | -1/+1 |
| * | | | | | | | | | tests: do not borrow from COPYING and README from the real source | Junio C Hamano | 2015-02-15 | 7 | -26/+433 |
| * | | | | | | | | | t4010: correct expected object names | Junio C Hamano | 2015-02-15 | 1 | -1/+1 |
| * | | | | | | | | | t9300: correct expected object names | Junio C Hamano | 2015-02-15 | 1 | -2/+2 |
| * | | | | | | | | | t4008: correct stale comments | Junio C Hamano | 2015-02-15 | 1 | -3/+3 |