Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'hv/submodule-recurse-push' | Junio C Hamano | 2012-04-24 | 2 | -0/+127 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | push: teach --recurse-submodules the on-demand option | Heiko Voigt | 2012-03-30 | 1 | -0/+94 | |
| * | | | | | | Teach revision walking machinery to walk multiple times sequencially | Heiko Voigt | 2012-03-30 | 1 | -0/+33 | |
* | | | | | | | Merge branch 'bw/test-fix-grep-gnuism' | Junio C Hamano | 2012-04-23 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | t9400: fix gnuism in grep | Junio C Hamano | 2012-04-19 | 1 | -2/+2 | |
* | | | | | | | | Merge branch 'jn/more-i18ncmp' | Junio C Hamano | 2012-04-23 | 3 | -8/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | test: am of empty patch should not succeed | Jonathan Nieder | 2012-04-14 | 1 | -1/+1 | |
| * | | | | | | | | test: use test_i18ncmp for "Patch format detection failed" message | Jonathan Nieder | 2012-04-14 | 1 | -1/+1 | |
| * | | | | | | | | test: do not rely on US English tracking-info messages | Jonathan Nieder | 2012-04-14 | 2 | -6/+6 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'lp/maint-diff-three-dash-with-graph' | Junio C Hamano | 2012-04-23 | 1 | -0/+290 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | t4202: add test for "log --graph --stat -p" separator lineslp/maint-diff-three-dash-with-graph | Lucian Poston | 2012-03-20 | 1 | -0/+290 | |
* | | | | | | | | | Merge branch 'sl/test-wc-l-line-count' | Junio C Hamano | 2012-04-23 | 19 | -74/+65 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | tests: modernise style: more uses of test_line_count | Stefano Lattarini | 2012-04-11 | 19 | -74/+65 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'rl/show-empty-prefix' | Junio C Hamano | 2012-04-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | rev-parse --show-prefix: add in trailing newline | Ross Lagerwall | 2012-04-10 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'pw/git-p4' | Junio C Hamano | 2012-04-23 | 12 | -184/+182 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| * | | | | | | | | git p4: use "git p4" directly in tests | Pete Wyckoff | 2012-04-09 | 12 | -184/+182 | |
| * | | | | | | | | git-p4: move to toplevel | Pete Wyckoff | 2012-04-09 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'jk/rebase-i-submodule-conflict-only' | Junio C Hamano | 2012-04-23 | 1 | -0/+30 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | rebase -i continue: don't skip commits that only change submodules | John Keeping | 2012-04-09 | 1 | -0/+30 | |
| | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Merge branch 'tr/cache-tree' into maint-1.7.8 | Junio C Hamano | 2012-04-09 | 1 | -0/+93 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8 | Junio C Hamano | 2012-04-09 | 1 | -0/+28 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8 | Junio C Hamano | 2012-04-09 | 1 | -22/+35 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8 | Junio C Hamano | 2012-04-09 | 1 | -24/+23 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'ct/advise-push-default' | Junio C Hamano | 2012-04-20 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix httpd tests that broke when non-ff push advice changed | Christopher Tiwald | 2012-04-12 | 2 | -2/+2 | |
* | | | | | | | | | | | | Merge branch 'jk/run-command-eacces' | Junio C Hamano | 2012-04-20 | 1 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | run-command: treat inaccessible directories as ENOENT | Jeff King | 2012-04-05 | 1 | -0/+13 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jc/push-upstream-sanity' | Junio C Hamano | 2012-04-20 | 1 | -0/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | push: error out when the "upstream" semantics does not make sense | Junio C Hamano | 2012-04-05 | 1 | -0/+54 | |
* | | | | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people' | Junio C Hamano | 2012-04-20 | 1 | -3/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-people | Junio C Hamano | 2012-03-13 | 1 | -3/+24 | |
* | | | | | | | | | | | | | | Merge branch 'jk/add-p-skip-conflicts' | Junio C Hamano | 2012-04-16 | 1 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | add--interactive: ignore unmerged entries in patch mode | Jeff King | 2012-04-05 | 1 | -0/+26 | |
* | | | | | | | | | | | | | | | Merge branch 'jc/commit-unedited-template' | Junio C Hamano | 2012-04-16 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | commit: rephrase the error when user did not touch templated log message | Junio C Hamano | 2012-03-30 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | commit: do not trigger bogus "has templated message edited" check | Junio C Hamano | 2012-03-30 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | t7501: test the right kind of breakage | Junio C Hamano | 2012-03-30 | 1 | -0/+2 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'wk/gitweb-snapshot-use-if-modified-since' | Junio C Hamano | 2012-04-16 | 1 | -1/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | gitweb: add If-Modified-Since handling to git_snapshot(). | W. Trevor King | 2012-03-30 | 1 | -0/+33 | |
| * | | | | | | | | | | | | | | | gitweb: refactor If-Modified-Since handling | W. Trevor King | 2012-03-30 | 1 | -1/+26 | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env' | Junio C Hamano | 2012-04-16 | 2 | -0/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | http-backend: respect existing GIT_COMMITTER_* variables | Jeff King | 2012-03-30 | 2 | -0/+28 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'jn/maint-fast-import-empty-ls' into maint | Junio C Hamano | 2012-03-26 | 1 | -0/+39 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ms/maint-config-error-at-eol-linecount' into maint | Junio C Hamano | 2012-03-26 | 1 | -0/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.8' into maint | Junio C Hamano | 2012-03-20 | 2 | -3/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8 | Junio C Hamano | 2012-03-20 | 1 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8 | Junio C Hamano | 2012-03-20 | 1 | -0/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-no-rename-empty' | Junio C Hamano | 2012-04-16 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-empty | Jeff King | 2012-03-23 | 1 | -0/+16 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |