Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fc/doc-fast-forward' | Junio C Hamano | 2009-11-16 | 35 | -73/+73 |
|\ | |||||
| * | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-25 | 35 | -71/+71 |
* | | Merge branch 'sc/difftool-p4merge' | Junio C Hamano | 2009-11-16 | 5 | -6/+19 |
|\ \ | |||||
| * | | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon | 2009-10-29 | 5 | -6/+19 |
* | | | Merge branch 'jk/maint-add-p-empty' | Junio C Hamano | 2009-11-16 | 2 | -5/+30 |
|\ \ \ | |||||
| * | | | add-interactive: handle deletion of empty files | Jeff King | 2009-10-28 | 2 | -5/+30 |
| | |/ | |/| | |||||
* | | | Merge branch 'lt/revision-bisect' | Junio C Hamano | 2009-11-16 | 4 | -1/+32 |
|\ \ \ | |||||
| * | | | Add '--bisect' revision machinery argument | Linus Torvalds | 2009-10-29 | 4 | -1/+32 |
| |/ / | |||||
* | | | Merge branch 'maint' | Junio C Hamano | 2009-11-15 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | git-add.txt: fix formatting of --patch section | Stephen Boyd | 2009-11-14 | 1 | -4/+4 |
* | | | | bash: add the merge option --ff-only | Björn Gustavsson | 2009-11-15 | 1 | -1/+1 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2009-11-11 | 0 | -0/+0 |
|\| | | | |||||
| * | | | check-ref-format -h: it does not know the --print option yet | Junio C Hamano | 2009-11-11 | 1 | -1/+1 |
* | | | | git-describe.txt: formatting fix | Junio C Hamano | 2009-11-10 | 1 | -0/+1 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2009-11-10 | 2 | -2/+5 |
|\| | | | |||||
| * | | | merge: do not setup worktree twice | Jonathan Nieder | 2009-11-10 | 1 | -1/+0 |
| * | | | check-ref-format: update usage string | Jonathan Nieder | 2009-11-10 | 1 | -1/+5 |
* | | | | Merge branch 'jk/maint-format-patch-p-suppress-stat' | Junio C Hamano | 2009-11-10 | 2 | -2/+28 |
|\ \ \ \ | |||||
| * | | | | format-patch: make "-p" suppress diffstat | Jeff King | 2009-11-09 | 2 | -2/+28 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'pb/maint-gitweb-blob-lineno' | Junio C Hamano | 2009-11-10 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | gitweb: Fix blob linenr links in pathinfo mode | Petr Baudis | 2009-11-06 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | Merge branch 'tr/describe-advice' | Junio C Hamano | 2009-11-10 | 1 | -4/+12 |
|\ \ \ \ | |||||
| * | | | | describe: when failing, tell the user about options that work | Thomas Rast | 2009-10-29 | 1 | -4/+12 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/maint-1.6.3-ls-files-i' | Junio C Hamano | 2009-11-10 | 3 | -2/+20 |
|\ \ \ \ | |||||
| * | | | | ls-files: unbreak "ls-files -i" | Jeff King | 2009-10-30 | 3 | -2/+20 |
* | | | | | Merge branch 'bg/merge-ff-only' | Junio C Hamano | 2009-11-10 | 4 | -3/+61 |
|\ \ \ \ \ | |||||
| * | | | | | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 2009-10-31 | 4 | -3/+61 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'vl/maint-openssl-signature-change' | Junio C Hamano | 2009-11-10 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | imap-send.c: fix compiler warnings for OpenSSL 1.0 | Vietor Liu | 2009-10-31 | 1 | -0/+4 |
* | | | | | | Merge branch 'jk/maint-push-config' | Junio C Hamano | 2009-11-10 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | push: always load default config | Jeff King | 2009-10-26 | 1 | -2/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/gitignore-anchored' | Junio C Hamano | 2009-11-10 | 1 | -177/+177 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitignore: root most patterns at the top-level directory | Jeff King | 2009-10-28 | 1 | -177/+177 |
* | | | | | | | Merge branch 'jp/dirty-describe' | Junio C Hamano | 2009-11-10 | 3 | -1/+44 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Teach "git describe" --dirty option | Jean Privat | 2009-10-27 | 3 | -1/+44 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sr/blame-incomplete' | Junio C Hamano | 2009-11-10 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | blame: make sure that the last line ends in an LF | Johannes Schindelin | 2009-10-22 | 1 | -0/+6 |
| |/ / / / / / | |||||
* | | | | | | | git-update-index.txt: Document the --really-refresh option. | Štěpán Němec | 2009-11-10 | 1 | -1/+5 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-11-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Add intermediate build products to .gitignore | Jonathan Nieder | 2009-11-09 | 1 | -0/+1 |
* | | | | | | | Merge branch 'jc/commit-s-subject-is-not-a-footer' | Junio C Hamano | 2009-11-07 | 2 | -1/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin-commit.c: fix logic to omit empty line before existing footers | Junio C Hamano | 2009-11-07 | 2 | -1/+10 |
* | | | | | | | | pack-objects: move thread autodetection closer to relevant code | Nicolas Pitre | 2009-11-06 | 1 | -5/+2 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-11-05 | 4 | -7/+13 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Fix documentation grammar typo | Gisle Aas | 2009-11-05 | 1 | -1/+1 |
| * | | | | | | | Allow curl helper to work without a local repository | Daniel Barkalow | 2009-11-04 | 1 | -1/+4 |
| * | | | | | | | Require a struct remote in transport_get() | Daniel Barkalow | 2009-11-04 | 2 | -5/+8 |
| * | | | | | | | Merge branch 'bg/clone-doc' into maint | Junio C Hamano | 2009-11-02 | 1 | -13/+13 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'jn/show-normalized-refs' | Junio C Hamano | 2009-11-02 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t1402: Make test executable | Stephen Boyd | 2009-11-02 | 1 | -0/+0 |