Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | t3509: Add rename + D/F conflict testcase that recursive strategy fails | Elijah Newren | 2010-09-09 | 1 | -0/+66 | |
* | | | | Merge branch 'jl/clone-recurse-sm-synonym' | Junio C Hamano | 2010-11-29 | 2 | -1/+5 | |
|\ \ \ \ | ||||||
| * | | | | clone: Add the --recurse-submodules option as alias for --recursive | Jens Lehmann | 2010-11-05 | 2 | -1/+5 | |
* | | | | | Merge branch 'jn/cherry-pick-refresh-index' | Junio C Hamano | 2010-11-29 | 2 | -2/+26 | |
|\ \ \ \ \ | ||||||
| * | | | | | cherry-pick/revert: transparently refresh index | Jonathan Nieder | 2010-11-10 | 2 | -2/+26 | |
* | | | | | | Merge branch 'jc/emfile' | Junio C Hamano | 2010-11-29 | 1 | -18/+30 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | A loose object is not corrupt if it cannot be read due to EMFILE | Junio C Hamano | 2010-11-03 | 1 | -1/+6 | |
| * | | | | | | read_sha1_file(): report correct name of packfile with a corrupt object | Junio C Hamano | 2010-11-03 | 1 | -17/+24 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge branch 'md/interix' | Junio C Hamano | 2010-11-29 | 4 | -0/+58 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Interix: add configure checks | Markus Duft | 2010-10-28 | 1 | -0/+18 | |
| * | | | | | | add support for the SUA layer (interix; windows) | Markus Duft | 2010-10-28 | 3 | -0/+40 | |
* | | | | | | | Merge branch 'jl/add-p-reverse-message' | Junio C Hamano | 2010-11-29 | 1 | -2/+11 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Correct help blurb in checkout -p and friends | Jonathan "Duke" Leto | 2010-10-28 | 1 | -2/+11 | |
* | | | | | | | | Merge branch 'np/pack-broken-boundary' | Junio C Hamano | 2010-11-29 | 1 | -1/+15 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | make pack-objects a bit more resilient to repo corruption | Nicolas Pitre | 2010-10-22 | 1 | -1/+15 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'np/diff-in-corrupt-repository' | Junio C Hamano | 2010-11-29 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | diff: don't presume empty file when corresponding object is missing | Nicolas Pitre | 2010-10-21 | 1 | -2/+6 | |
* | | | | | | | | | Merge branch 'fc/apply-p2-get-header-name' | Junio C Hamano | 2010-11-29 | 2 | -14/+40 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | test: git-apply -p2 rename/chmod only | Junio C Hamano | 2010-11-05 | 1 | -0/+26 | |
| * | | | | | | | | | Fix git-apply with -p greater than 1 | Federico Cuello | 2010-11-05 | 1 | -14/+14 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'jn/fast-import-fix' | Junio C Hamano | 2010-11-29 | 2 | -12/+145 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fast-import: do not clear notes in do_change_note_fanout() | Jonathan Nieder | 2010-10-20 | 1 | -4/+1 | |
| * | | | | | | | | | t9300 (fast-import): another test for the "replace root" feature | Jonathan Nieder | 2010-10-19 | 1 | -1/+42 | |
| * | | | | | | | | | fast-import: tighten M 040000 syntax | Jonathan Nieder | 2010-10-18 | 2 | -9/+55 | |
| * | | | | | | | | | fast-import: filemodify after M 040000 <tree> "" crashes | Jonathan Nieder | 2010-10-18 | 2 | -4/+53 | |
* | | | | | | | | | | Merge branch 'rr/needs-clean-work-tree' | Junio C Hamano | 2010-11-29 | 4 | -28/+34 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Porcelain scripts: Rewrite cryptic "needs update" error message | Ramkumar Ramachandra | 2010-10-28 | 4 | -28/+34 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'kb/blame-author-email' | Junio C Hamano | 2010-11-29 | 4 | -13/+38 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | blame: Add option to show author email instead of name | Kevin Ballard | 2010-10-19 | 4 | -13/+38 | |
* | | | | | | | | | | | Merge branch 'cm/diff-check-at-eol' | Junio C Hamano | 2010-11-29 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | diff --check: correct line numbers of new blank lines at EOF | Christoph Mallon | 2010-10-16 | 2 | -1/+10 | |
* | | | | | | | | | | | | Merge branch 'ak/apply-non-git-epoch' | Junio C Hamano | 2010-11-29 | 5 | -6/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | apply: handle patches with funny filename and colon in timezone | Jonathan Nieder | 2010-11-10 | 4 | -2/+48 | |
| * | | | | | | | | | | | | apply: Recognize epoch timestamps with : in the timezone | Anders Kaseorg | 2010-10-13 | 2 | -4/+9 | |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'tc/smart-http-post-redirect' | Junio C Hamano | 2010-11-29 | 3 | -0/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | smart-http: Don't change POST to GET when following redirect | Tay Ray Chuan | 2010-09-27 | 3 | -0/+20 | |
* | | | | | | | | | | | | | Merge branch 'en/and-cascade-tests' | Junio C Hamano | 2010-11-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | t7300: add a missing SYMLINKS prerequisite | Johannes Sixt | 2010-11-26 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano | 2010-11-24 | 2 | -1/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 2010-11-15 | 2 | -1/+35 | |
* | | | | | | | | | | | | | | | Merge branch 'ao/send-email-irt' | Junio C Hamano | 2010-11-24 | 3 | -6/+65 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | git-send-email.perl: make initial In-Reply-To apply only to first email | Antonio Ospite | 2010-11-12 | 3 | -7/+25 | |
| * | | | | | | | | | | | | | | | t9001: send-email interation with --in-reply-to and --chain-reply-to | Junio C Hamano | 2010-11-05 | 1 | -0/+41 | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/add-e-doc' | Junio C Hamano | 2010-11-24 | 1 | -3/+77 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | docs: give more hints about how "add -e" works | Jeff King | 2010-11-09 | 1 | -28/+76 | |
| * | | | | | | | | | | | | | | | | docs: give more hints about how "add -e" works | Jeff King | 2010-10-21 | 1 | -3/+29 | |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/opt-help-text' | Junio C Hamano | 2010-11-24 | 31 | -59/+66 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | verify-tag: document --verbose | René Scharfe | 2010-11-15 | 2 | -1/+5 | |
| * | | | | | | | | | | | | | | | | | branch: improve --verbose description | René Scharfe | 2010-11-15 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | archive: improve --verbose description | René Scharfe | 2010-11-15 | 1 | -1/+1 |