Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'pw/git-p4' | Junio C Hamano | 2012-04-23 |
|\ | |||
| * | git p4: use "git p4" directly in tests | Pete Wyckoff | 2012-04-09 |
| * | git p4: update name in script | Pete Wyckoff | 2012-04-09 |
| * | git-p4: move to toplevel | Pete Wyckoff | 2012-04-09 |
* | | Merge branch 'ms/remote-usage-string' | Junio C Hamano | 2012-04-23 |
|\ \ | |||
| * | | remote: update builtin usage | Michael Schubert | 2012-04-09 |
* | | | Merge branch 'jk/rebase-i-submodule-conflict-only' | Junio C Hamano | 2012-04-23 |
|\ \ \ | |||
| * | | | rebase -i continue: don't skip commits that only change submodules | John Keeping | 2012-04-09 |
* | | | | RelNotes: the third batch | Junio C Hamano | 2012-04-20 |
* | | | | Merge branch 'js/spawn-via-shell-path-fix' | Junio C Hamano | 2012-04-20 |
|\ \ \ \ | |||
| * | | | | Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows | Johannes Sixt | 2012-04-17 |
* | | | | | Merge branch 'ct/advise-push-default' | Junio C Hamano | 2012-04-20 |
|\ \ \ \ \ | |||
| * | | | | | Fix httpd tests that broke when non-ff push advice changed | Christopher Tiwald | 2012-04-12 |
| * | | | | | clean up struct ref's nonfastforward field | Jeff King | 2012-03-26 |
| * | | | | | push: Provide situational hints for non-fast-forward errors | Christopher Tiwald | 2012-03-19 |
* | | | | | | Merge branch 'bw/submodule-sed-solaris' | Junio C Hamano | 2012-04-20 |
|\ \ \ \ \ \ | |||
| * | | | | | | Avoid bug in Solaris xpg4/sed as used in submodule | Ben Walton | 2012-04-09 |
| | |_|_|_|/ | |/| | | | | |||
* | | | | | | Merge branch 'jk/run-command-eacces' | Junio C Hamano | 2012-04-20 |
|\ \ \ \ \ \ | |||
| * | | | | | | run-command: treat inaccessible directories as ENOENT | Jeff King | 2012-04-05 |
| * | | | | | | compat/mingw.[ch]: Change return type of exec functions to int | Ramsay Jones | 2012-04-05 |
* | | | | | | | Merge branch 'jc/push-upstream-sanity' | Junio C Hamano | 2012-04-20 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | push: error out when the "upstream" semantics does not make sense | Junio C Hamano | 2012-04-05 |
* | | | | | | | | Merge branch 'jc/am-report-3way' | Junio C Hamano | 2012-04-20 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | am -3: list the paths that needed 3-way fallback | Junio C Hamano | 2012-03-28 |
* | | | | | | | | | Merge branch 'jb/am-include' | Junio C Hamano | 2012-04-20 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | am: support --include option | Johannes Berg | 2012-03-28 |
* | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people' | Junio C Hamano | 2012-04-20 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | fmt-merge-msg: show those involved in a merged series | Junio C Hamano | 2012-03-13 |
* | | | | | | | | | | | RelNotes: the second batch of topics graduated to 'master' | Junio C Hamano | 2012-04-16 |
* | | | | | | | | | | | Merge branch 'jk/add-p-skip-conflicts' | Junio C Hamano | 2012-04-16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | add--interactive: ignore unmerged entries in patch mode | Jeff King | 2012-04-05 |
* | | | | | | | | | | | | Merge branch 'jc/commit-unedited-template' | Junio C Hamano | 2012-04-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Documentation/git-commit: rephrase the "initial-ness" of templates | Junio C Hamano | 2012-04-03 |
| * | | | | | | | | | | | | git-commit.txt: clarify -t requires editing message | Adam Monsen | 2012-04-01 |
| * | | | | | | | | | | | | commit: rephrase the error when user did not touch templated log message | Junio C Hamano | 2012-03-30 |
| * | | | | | | | | | | | | commit: do not trigger bogus "has templated message edited" check | Junio C Hamano | 2012-03-30 |
| * | | | | | | | | | | | | t7501: test the right kind of breakage | Junio C Hamano | 2012-03-30 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'bw/spawn-via-shell-path' | Junio C Hamano | 2012-04-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd | Ben Walton | 2012-04-03 |
* | | | | | | | | | | | | Merge branch 'wk/gitweb-snapshot-use-if-modified-since' | Junio C Hamano | 2012-04-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | gitweb: add If-Modified-Since handling to git_snapshot(). | W. Trevor King | 2012-03-30 |
| * | | | | | | | | | | | | gitweb: refactor If-Modified-Since handling | W. Trevor King | 2012-03-30 |
| * | | | | | | | | | | | | gitweb: add `status` headers to git_feed() responses. | W. Trevor King | 2012-03-30 |
* | | | | | | | | | | | | | Merge branch 'jk/http-backend-keep-committer-ident-env' | Junio C Hamano | 2012-04-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | http-backend: respect existing GIT_COMMITTER_* variables | Jeff King | 2012-03-30 |
* | | | | | | | | | | | | | | Merge branch 'sl/autoconf' | Junio C Hamano | 2012-04-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | configure: be more idiomatic | Stefano Lattarini | 2012-03-26 |
| * | | | | | | | | | | | | | | configure: avoid some code repetitions thanks to m4_{push,pop}def | Stefano Lattarini | 2012-03-26 |
| * | | | | | | | | | | | | | | configure: move definitions of private m4 macros before AC_INIT invocation | Stefano Lattarini | 2012-03-26 |
* | | | | | | | | | | | | | | | Merge branch 'jk/branch-quiet' | Junio C Hamano | 2012-04-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |