summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | t3509: Add rename + D/F conflict testcase that recursive strategy failsElijah Newren2010-09-091-0/+66
* | | | Merge branch 'jl/clone-recurse-sm-synonym'Junio C Hamano2010-11-292-1/+5
|\ \ \ \
| * | | | clone: Add the --recurse-submodules option as alias for --recursiveJens Lehmann2010-11-052-1/+5
* | | | | Merge branch 'jn/cherry-pick-refresh-index'Junio C Hamano2010-11-292-2/+26
|\ \ \ \ \
| * | | | | cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-102-2/+26
* | | | | | Merge branch 'jc/emfile'Junio C Hamano2010-11-291-18/+30
|\ \ \ \ \ \
| * | | | | | A loose object is not corrupt if it cannot be read due to EMFILEJunio C Hamano2010-11-031-1/+6
| * | | | | | read_sha1_file(): report correct name of packfile with a corrupt objectJunio C Hamano2010-11-031-17/+24
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'md/interix'Junio C Hamano2010-11-294-0/+58
|\ \ \ \ \ \
| * | | | | | Interix: add configure checksMarkus Duft2010-10-281-0/+18
| * | | | | | add support for the SUA layer (interix; windows)Markus Duft2010-10-283-0/+40
* | | | | | | Merge branch 'jl/add-p-reverse-message'Junio C Hamano2010-11-291-2/+11
|\ \ \ \ \ \ \
| * | | | | | | Correct help blurb in checkout -p and friendsJonathan "Duke" Leto2010-10-281-2/+11
* | | | | | | | Merge branch 'np/pack-broken-boundary'Junio C Hamano2010-11-291-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | make pack-objects a bit more resilient to repo corruptionNicolas Pitre2010-10-221-1/+15
| |/ / / / / / /
* | | | | | | | Merge branch 'np/diff-in-corrupt-repository'Junio C Hamano2010-11-291-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: don't presume empty file when corresponding object is missingNicolas Pitre2010-10-211-2/+6
* | | | | | | | | Merge branch 'fc/apply-p2-get-header-name'Junio C Hamano2010-11-292-14/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test: git-apply -p2 rename/chmod onlyJunio C Hamano2010-11-051-0/+26
| * | | | | | | | | Fix git-apply with -p greater than 1Federico Cuello2010-11-051-14/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jn/fast-import-fix'Junio C Hamano2010-11-292-12/+145
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-import: do not clear notes in do_change_note_fanout()Jonathan Nieder2010-10-201-4/+1
| * | | | | | | | | t9300 (fast-import): another test for the "replace root" featureJonathan Nieder2010-10-191-1/+42
| * | | | | | | | | fast-import: tighten M 040000 syntaxJonathan Nieder2010-10-182-9/+55
| * | | | | | | | | fast-import: filemodify after M 040000 <tree> "" crashesJonathan Nieder2010-10-182-4/+53
* | | | | | | | | | Merge branch 'rr/needs-clean-work-tree'Junio C Hamano2010-11-294-28/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra2010-10-284-28/+34
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'kb/blame-author-email'Junio C Hamano2010-11-294-13/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | blame: Add option to show author email instead of nameKevin Ballard2010-10-194-13/+38
* | | | | | | | | | | Merge branch 'cm/diff-check-at-eol'Junio C Hamano2010-11-292-1/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff --check: correct line numbers of new blank lines at EOFChristoph Mallon2010-10-162-1/+10
* | | | | | | | | | | | Merge branch 'ak/apply-non-git-epoch'Junio C Hamano2010-11-295-6/+57
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply: handle patches with funny filename and colon in timezoneJonathan Nieder2010-11-104-2/+48
| * | | | | | | | | | | | apply: Recognize epoch timestamps with : in the timezoneAnders Kaseorg2010-10-132-4/+9
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tc/smart-http-post-redirect'Junio C Hamano2010-11-293-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | smart-http: Don't change POST to GET when following redirectTay Ray Chuan2010-09-273-0/+20
* | | | | | | | | | | | | Merge branch 'en/and-cascade-tests'Junio C Hamano2010-11-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t7300: add a missing SYMLINKS prerequisiteJohannes Sixt2010-11-261-1/+1
* | | | | | | | | | | | | | Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano2010-11-242-1/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-152-1/+35
* | | | | | | | | | | | | | | Merge branch 'ao/send-email-irt'Junio C Hamano2010-11-243-6/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-send-email.perl: make initial In-Reply-To apply only to first emailAntonio Ospite2010-11-123-7/+25
| * | | | | | | | | | | | | | | t9001: send-email interation with --in-reply-to and --chain-reply-toJunio C Hamano2010-11-051-0/+41
* | | | | | | | | | | | | | | | Merge branch 'jk/add-e-doc'Junio C Hamano2010-11-241-3/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | docs: give more hints about how "add -e" worksJeff King2010-11-091-28/+76
| * | | | | | | | | | | | | | | | docs: give more hints about how "add -e" worksJeff King2010-10-211-3/+29
* | | | | | | | | | | | | | | | | Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-2431-59/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | verify-tag: document --verboseRené Scharfe2010-11-152-1/+5
| * | | | | | | | | | | | | | | | | branch: improve --verbose descriptionRené Scharfe2010-11-151-1/+2
| * | | | | | | | | | | | | | | | | archive: improve --verbose descriptionRené Scharfe2010-11-151-1/+1