Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'da/difftool' | Junio C Hamano | 2009-04-17 |
|\ | |||
| * | mergetool--lib: simplify API usage by removing more global variables | David Aguilar | 2009-04-12 |
| * | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar | 2009-04-08 |
| * | difftool: add support for a difftool.prompt config variable | David Aguilar | 2009-04-07 |
| * | difftool: move 'git-difftool' out of contrib | David Aguilar | 2009-04-07 |
| * | difftool/mergetool: add diffuse as merge and diff tool | Sebastian Pipping | 2009-04-07 |
| * | git-mergetool: add new merge tool TortoiseMerge | Markus Heidelberg | 2009-04-07 |
| * | doc/merge-config: list ecmerge as a built-in merge tool | Markus Heidelberg | 2009-04-07 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-04-17 |
|\ \ | |||
| * | | doc/gitattributes: clarify location of config text | Jeff King | 2009-04-17 |
* | | | GIT 1.6.3-rc0v1.6.3-rc0 | Junio C Hamano | 2009-04-12 |
* | | | Documentation/git.txt: GIT 1.6.2.2 has been out for a while | Nanako Shiraishi | 2009-04-12 |
* | | | Merge branch 'sb/doc-upstream-branch' | Junio C Hamano | 2009-04-12 |
|\ \ \ | |||
| * | | | Documentation: Introduce "upstream branch" | Santi BĂ©jar | 2009-04-07 |
* | | | | Merge branch 'jk/show-upstream' | Junio C Hamano | 2009-04-12 |
|\ \ \ \ | |||
| * | | | | branch: show upstream branch when double verbose | Jeff King | 2009-04-07 |
| * | | | | for-each-ref: add "upstream" format field | Jeff King | 2009-04-07 |
* | | | | | Merge branch 'fg/remote-prune' | Junio C Hamano | 2009-04-12 |
|\ \ \ \ \ | |||
| * | | | | | git remote update: Fallback to remote if group does not exist | Finn Arne Gangstad | 2009-04-07 |
| * | | | | | git remote update: New option --prune | Finn Arne Gangstad | 2009-04-05 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-04-12 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| * | | | | | GIT 1.6.2.3v1.6.2.3 | Junio C Hamano | 2009-04-12 |
| * | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-12 |
| |\ \ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-12 |
| | |\ \ \ \ \ | |||
| | | * | | | | | State the effect of filter-branch on graft explicitly | Daniel Cheng (aka SDiZ) | 2009-04-12 |
| | * | | | | | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1 | Junio C Hamano | 2009-04-08 |
| | |\ \ \ \ \ \ | |||
* | | | | | | | | | documentation: Makefile accounts for SHELL_PATH setting | Ben Walton | 2009-04-12 |
* | | | | | | | | | git-svn: Save init/clone --ignore-paths in config | Ben Jackson | 2009-04-11 |
* | | | | | | | | | git-svn: Add per-svn-remote ignore-paths config | Ben Jackson | 2009-04-11 |
* | | | | | | | | | git-svn: add fetch --parent option | Jason Merrill | 2009-04-11 |
* | | | | | | | | | Update draft release notes to 1.6.3 | Junio C Hamano | 2009-04-09 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-04-08 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||
| * | | | | | | | | Start 1.6.2.3 preparation | Junio C Hamano | 2009-04-08 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-04-07 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||
| * | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-07 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||
| | * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-07 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||
| | | * | | | | | | Documentation: clarify .gitattributes search | Jason Merrill | 2009-04-07 |
| | | * | | | | | | git-checkout.txt: clarify that <branch> applies when no path is given. | Matthieu Moy | 2009-04-07 |
| | | * | | | | | | git-checkout.txt: fix incorrect statement about HEAD and index | Matthieu Moy | 2009-04-07 |
* | | | | | | | | | Merge branch 'mh/html-path' | Junio C Hamano | 2009-04-07 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||
| * | | | | | | | | add --html-path to get the location of installed HTML docs | Markus Heidelberg | 2009-04-04 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | git-rev-list.txt: make ascii markup uniform with other pages. | Matthieu Moy | 2009-04-07 |
* | | | | | | | | git-send-email.txt: clarify which options take an argument. | Matthieu Moy | 2009-04-07 |
| |_|_|_|_|/ / |/| | | | | | | |||
* | | | | | | | Merge branch 'jc/name-branch' | Junio C Hamano | 2009-04-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Don't permit ref/branch names to end with ".lock" | Shawn O. Pearce | 2009-03-24 |
| * | | | | | | | check_ref_format(): tighten refname rules | Junio C Hamano | 2009-03-24 |
| * | | | | | | | check-ref-format --branch: give Porcelain a way to grok branch shorthand | Junio C Hamano | 2009-03-22 |
* | | | | | | | | Merge branch 'sb/format-patch-patchname' | Junio C Hamano | 2009-04-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | pretty.c: add %f format specifier to format_commit_message() | Stephen Boyd | 2009-03-22 |
| |/ / / / / / / | |||
* | | | | | | | | user-manual: the name of the hash function is SHA-1, not sha1 | Felipe Contreras | 2009-04-06 |