Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | 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 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' | Junio C Hamano | 2012-04-16 | 1 | -5/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdir | Junio C Hamano | 2012-03-15 | 1 | -5/+22 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool-test' | Junio C Hamano | 2012-04-15 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | t7800: Test difftool passing arguments to diffda/difftool-test | David Aguilar | 2012-03-19 | 1 | -0/+11 | |
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'zj/test-cred-helper-nicer-prove' | Junio C Hamano | 2012-04-15 | 1 | -24/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | t0303: resurrect commit message as test documentationzj/test-cred-helper-nicer-prove | Zbigniew Jędrzejewski-Szmek | 2012-03-15 | 1 | -1/+29 | |
| * | | | | | | | | | | | | | | | | | | | | | t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER | Zbigniew Jędrzejewski-Szmek | 2012-03-15 | 1 | -23/+16 | |
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/notes-merge-in-git-dir-worktree' | Junio C Hamano | 2012-04-15 | 1 | -4/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktree | Johan Herland | 2012-03-15 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | notes-merge: use opendir/readdir instead of using read_directory() | Johan Herland | 2012-03-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ | Johan Herland | 2012-03-15 | 1 | -0/+19 | |
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-word-diff-regex-sticky' | Junio C Hamano | 2012-04-15 | 1 | -0/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-sticky | Thomas Rast | 2012-03-14 | 1 | -1/+1 |