Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 1.6.2.4 | Junio C Hamano | 2009-04-19 | 4 | -16/+25 |
|\ | |||||
| * | GIT 1.6.2.4v1.6.2.4 | Junio C Hamano | 2009-04-19 | 1 | -1/+9 |
| * | Merge branch 'mm/maint-add-p-quit' into maint | Junio C Hamano | 2009-04-19 | 1 | -0/+3 |
| |\ | |||||
| | * | Update git-add.txt according to the new possibilities of 'git add -p'. | Matthieu Moy | 2009-04-19 | 1 | -1/+3 |
| | * | git add -p: new "quit" command at the prompt. | Matthieu Moy | 2009-04-19 | 1 | -0/+1 |
| * | | Merge branch 'jc/maint-shared-literally' into maint | Junio C Hamano | 2009-04-19 | 2 | -7/+15 |
| |\ \ | |||||
| | * | | Update docs on behaviour of 'core.sharedRepository' and 'git init --shared' | Johan Herland | 2009-04-18 | 2 | -7/+15 |
* | | | | Update draft release notes to 1.6.3v1.6.3-rc1 | Junio C Hamano | 2009-04-18 | 1 | -13/+21 |
* | | | | Merge branch 'lt/bool-on-off' | Junio C Hamano | 2009-04-18 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Documentation: boolean value may be given by on/off | Michał Kiedrowicz | 2009-04-17 | 1 | -1/+1 |
* | | | | | Merge branch 'nd/archive-attribute' | Junio C Hamano | 2009-04-18 | 1 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | archive: do not read .gitattributes in working directory | Nguyễn Thái Ngọc Duy | 2009-04-17 | 1 | -1/+4 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-04-18 | 3 | -10/+41 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Describe fixes since 1.6.2.3 | Junio C Hamano | 2009-04-18 | 1 | -0/+31 |
| * | | | | | doc/git-daemon: add missing arguments to max-connections option | Markus Heidelberg | 2009-04-18 | 1 | -1/+1 |
| * | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-04-18 | 1 | -8/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | doc/git-daemon: add missing arguments to options | Markus Heidelberg | 2009-04-18 | 1 | -8/+8 |
| * | | | | | | imap-send: use correct configuration variable in documentation | Paul Bolle | 2009-04-18 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/cobdoc' | Junio C Hamano | 2009-04-17 | 2 | -47/+45 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | docs/checkout: clarify what "non-branch" means | Jeff King | 2009-04-13 | 1 | -5/+5 |
| * | | | | | | | doc/checkout: split checkout and branch creation in synopsis | Jeff King | 2009-04-13 | 1 | -18/+22 |
| * | | | | | | | doc/checkout: refer to git-branch(1) as appropriate | Jeff King | 2009-04-13 | 1 | -19/+9 |
| * | | | | | | | doc: refer to tracking configuration as "upstream" | Jeff King | 2009-04-13 | 2 | -12/+14 |
| * | | | | | | | doc: clarify --no-track option | Jeff King | 2009-04-13 | 2 | -2/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mm/add-p-quit' | Junio C Hamano | 2009-04-17 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update git-add.txt according to the new possibilities of 'git add -p'. | Matthieu Moy | 2009-04-16 | 1 | -1/+3 |
| * | | | | | | | git add -p: new "quit" command at the prompt. | Matthieu Moy | 2009-04-15 | 1 | -0/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'eb/upload-archive-from-git-shell' | Junio C Hamano | 2009-04-17 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-shell: Add 'git-upload-archive' to allowed commands. | Erik Broes | 2009-04-11 | 1 | -3/+3 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'bw/short-ref-strict' | Junio C Hamano | 2009-04-17 | 2 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-parse: --abbrev-ref option to shorten ref name | Bert Wesarg | 2009-04-13 | 1 | -0/+5 |
| * | | | | | | | for-each-ref: utilize core.warnAmbiguousRefs for :short-format | Bert Wesarg | 2009-04-13 | 1 | -0/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2009-04-17 | 5 | -2/+184 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mergetool--lib: simplify API usage by removing more global variables | David Aguilar | 2009-04-12 | 1 | -9/+7 |
| * | | | | | | | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar | 2009-04-08 | 1 | -0/+56 |
| * | | | | | | | difftool: add support for a difftool.prompt config variable | David Aguilar | 2009-04-07 | 2 | -1/+12 |
| * | | | | | | | difftool: move 'git-difftool' out of contrib | David Aguilar | 2009-04-07 | 2 | -0/+115 |
| * | | | | | | | difftool/mergetool: add diffuse as merge and diff tool | Sebastian Pipping | 2009-04-07 | 2 | -2/+2 |
| * | | | | | | | git-mergetool: add new merge tool TortoiseMerge | Markus Heidelberg | 2009-04-07 | 2 | -2/+3 |
| * | | | | | | | doc/merge-config: list ecmerge as a built-in merge tool | Markus Heidelberg | 2009-04-07 | 1 | -1/+2 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-04-17 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | doc/gitattributes: clarify location of config text | Jeff King | 2009-04-17 | 1 | -3/+6 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | GIT 1.6.3-rc0v1.6.3-rc0 | Junio C Hamano | 2009-04-12 | 2 | -3/+14 |
* | | | | | | Documentation/git.txt: GIT 1.6.2.2 has been out for a while | Nanako Shiraishi | 2009-04-12 | 1 | -1/+2 |
* | | | | | | Merge branch 'sb/doc-upstream-branch' | Junio C Hamano | 2009-04-12 | 2 | -1/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: Introduce "upstream branch" | Santi Béjar | 2009-04-07 | 2 | -1/+7 |
* | | | | | | | Merge branch 'jk/show-upstream' | Junio C Hamano | 2009-04-12 | 2 | -1/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | branch: show upstream branch when double verbose | Jeff King | 2009-04-07 | 1 | -1/+3 |
| * | | | | | | | for-each-ref: add "upstream" format field | Jeff King | 2009-04-07 | 1 | -0/+5 |
* | | | | | | | | Merge branch 'fg/remote-prune' | Junio C Hamano | 2009-04-12 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ |