Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cb/log-follow-with-combined' | Junio C Hamano | 2013-06-11 | 1 | -0/+14 |
|\ | |||||
| * | fix segfault with git log -c --follow | Clemens Buchacher | 2013-05-28 | 1 | -0/+14 |
* | | Merge branch 'tr/test-commit-only-on-orphan' | Junio C Hamano | 2013-06-11 | 1 | -0/+13 |
|\ \ | |||||
| * | | Test 'commit --only' after 'checkout --orphan' | Thomas Rast | 2013-06-02 | 1 | -0/+13 |
* | | | Merge branch 'rr/die-on-missing-upstream' | Junio C Hamano | 2013-06-11 | 1 | -10/+5 |
|\ \ \ | |||||
| * | | | sha1_name: fix error message for @{u} | Ramkumar Ramachandra | 2013-05-22 | 1 | -10/+5 |
* | | | | Merge branch 'ks/difftool-dir-diff-copy-fix' | Junio C Hamano | 2013-06-06 | 1 | -0/+19 |
|\ \ \ \ | |||||
| * | | | | difftool --dir-diff: allow changing any clean working tree file | Kenichi Saita | 2013-05-29 | 1 | -0/+19 |
| |/ / / | |||||
* | | | | Merge branch 'fc/show-branch-in-rebase-am' | Junio C Hamano | 2013-06-06 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | prompt: fix for simple rebase | Felipe Contreras | 2013-05-29 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'nd/clone-connectivity-shortcut' | Junio C Hamano | 2013-06-06 | 1 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | fetch-pack: prepare updated shallow file before fetching the pack | Nguyễn Thái Ngọc Duy | 2013-05-28 | 1 | -0/+7 |
* | | | | | Merge branch 'rs/commit-m-no-edit' | Junio C Hamano | 2013-06-05 | 1 | -0/+17 |
|\ \ \ \ \ | |||||
| * | | | | | commit: don't start editor if empty message is given with -m | René Scharfe | 2013-05-28 | 1 | -0/+17 |
* | | | | | | Merge branch 'fc/send-email-chainreplyto-warning' | Junio C Hamano | 2013-06-05 | 1 | -49/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | send-email: remove warning about unset chainreplyto | Felipe Contreras | 2013-05-28 | 1 | -49/+0 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'fc/cleanups' | Junio C Hamano | 2013-06-05 | 3 | -17/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test: rebase: fix --interactive test | Felipe Contreras | 2013-05-28 | 1 | -1/+1 |
| * | | | | | | test: trivial cleanups | Felipe Contreras | 2013-05-28 | 2 | -16/+9 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-06-04 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/README: test_must_fail is for testing Git | Junio C Hamano | 2013-06-04 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'kb/status-ignored-optim-2' | Junio C Hamano | 2013-06-03 | 1 | -0/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | dir.c: fix ignore processing within not-ignored directories | Karsten Blees | 2013-06-02 | 1 | -0/+18 |
* | | | | | | | test: fix post rewrite hook report | Felipe Contreras | 2013-06-03 | 1 | -2/+2 |
* | | | | | | | Merge branch 'tr/line-log' | Junio C Hamano | 2013-06-02 | 17 | -0/+1646 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | log -L: store the path instead of a diff_filespec | Thomas Rast | 2013-04-12 | 1 | -1/+1 |
| * | | | | | | | log -L: test merge of parallel modify/rename | Thomas Rast | 2013-04-12 | 3 | -6/+250 |
| * | | | | | | | t4211: pass -M to 'git log -M -L...' test | Thomas Rast | 2013-04-12 | 2 | -9/+49 |
| * | | | | | | | log -L: fix overlapping input ranges | Thomas Rast | 2013-04-05 | 4 | -0/+356 |
| * | | | | | | | log -L: :pattern:file syntax to find by funcname | Thomas Rast | 2013-03-28 | 3 | -0/+174 |
| * | | | | | | | Implement line-history search (git log -L) | Thomas Rast | 2013-03-28 | 10 | -0/+826 |
| * | | | | | | | Refactor parse_loc | Bo Yang | 2013-03-28 | 1 | -0/+6 |
* | | | | | | | | Merge branch 'mc/describe-first-parent' | Junio C Hamano | 2013-06-02 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | describe: Add --first-parent option | Mike Crowe | 2013-05-20 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'rs/tar-tests' | Junio C Hamano | 2013-06-02 | 3 | -78/+92 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5000: test long filenames | René Scharfe | 2013-05-20 | 2 | -0/+46 |
| * | | | | | | | | | t5000: simplify tar-tree tests | René Scharfe | 2013-05-20 | 1 | -23/+8 |
| * | | | | | | | | | t5000: use check_tar for prefix test | René Scharfe | 2013-05-20 | 1 | -12/+12 |
| * | | | | | | | | | t5000: factor out check_tar | René Scharfe | 2013-05-20 | 1 | -13/+22 |
| * | | | | | | | | | t5000, t5003: create directories for extracted files lazily | René Scharfe | 2013-05-20 | 2 | -4/+4 |
| * | | | | | | | | | t5000: integrate export-subst tests into regular tests | René Scharfe | 2013-05-20 | 1 | -32/+6 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jc/strbuf-branchname-fix' | Junio C Hamano | 2013-06-02 | 1 | -2/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | strbuf_branchname(): do not double-expand @{-1}~22 | Junio C Hamano | 2013-05-16 | 1 | -2/+13 |
* | | | | | | | | | | Merge branch 'jk/fetch-always-update-tracking' | Junio C Hamano | 2013-06-02 | 1 | -4/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fetch: don't try to update unfetched tracking refs | John Keeping | 2013-05-28 | 1 | -0/+16 |
| * | | | | | | | | | | fetch: opportunistically update tracking refs | Jeff King | 2013-05-12 | 1 | -4/+4 |
| * | | | | | | | | | | t5510: start tracking-ref tests from a known state | Jeff King | 2013-05-12 | 1 | -0/+10 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'mk/combine-diff-context-horizon-fix' | Junio C Hamano | 2013-06-02 | 1 | -0/+48 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | combine-diff.c: Fix output when changes are exactly 3 lines apart | Matthijs Kooijman | 2013-05-15 | 1 | -0/+48 |
* | | | | | | | | | | | Merge branch 'kb/ancestry-path-threedots' | Junio C Hamano | 2013-06-02 | 1 | -1/+20 |
|\ \ \ \ \ \ \ \ \ \ \ |