Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/receive-pack-auto' into maint | Junio C Hamano | 2009-11-15 | 3 | -4/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gb/maint-gitweb-esc-param' into maint | Junio C Hamano | 2009-11-15 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/gitweb-patch' into maint | Junio C Hamano | 2009-11-15 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bs/maint-pre-commit-hook-sample' | Junio C Hamano | 2009-11-15 | 1 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | pre-commit.sample: Diff against the empty tree when HEAD is invalid | Björn Steinbrink | 2009-11-06 | 1 | -9/+9 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-diff-color-words' | Junio C Hamano | 2009-11-15 | 2 | -8/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | diff --color-words: bit of clean-up | Junio C Hamano | 2009-10-31 | 1 | -14/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | diff --color-words -U0: fix the location of hunk headers | Johannes Schindelin | 2009-10-30 | 2 | -1/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t4034-diff-words: add a test for word diff without context | Markus Heidelberg | 2009-10-30 | 1 | -0/+20 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/pretty-wrap' | Junio C Hamano | 2009-11-15 | 1 | -0/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | log --format: don't ignore %w() at the start of format string | René Scharfe | 2009-11-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Implement wrap format %w() as if it is a mode switch | René Scharfe | 2009-10-22 | 1 | -0/+57 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/log-rewrap' | Junio C Hamano | 2009-11-15 | 2 | -9/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Teach --wrap to only indent without wrapping | Junio C Hamano | 2009-10-22 | 1 | -0/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Add strbuf_add_wrapped_text() to utf8.[ch] | Johannes Schindelin | 2009-10-19 | 2 | -9/+26 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | print_wrapped_text(): allow hard newlines | Johannes Schindelin | 2009-10-19 | 1 | -2/+16 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/doc-fast-forward' | Junio C Hamano | 2009-11-15 | 35 | -73/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-24 | 35 | -71/+71 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sc/difftool-p4merge' | Junio C Hamano | 2009-11-15 | 5 | -6/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon | 2009-10-28 | 5 | -6/+19 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-add-p-empty' | Junio C Hamano | 2009-11-15 | 2 | -5/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | add-interactive: handle deletion of empty files | Jeff King | 2009-10-27 | 2 | -5/+30 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/revision-bisect' | Junio C Hamano | 2009-11-15 | 4 | -1/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add '--bisect' revision machinery argument | Linus Torvalds | 2009-10-28 | 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-14 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-11-10 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | check-ref-format -h: it does not know the --print option yet | Junio C Hamano | 2009-11-10 | 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-08 | 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-28 | 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-30 | 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-25 | 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-27 | 1 | -177/+177 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jp/dirty-describe' | Junio C Hamano | 2009-11-10 | 3 | -1/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |