summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/reset-more'Junio C Hamano2010-01-137-20/+435
|\
| * t7111: check that reset options work as described in the tablesChristian Couder2010-01-091-0/+113
| * Documentation: reset: add some missing tablesChristian Couder2010-01-041-6/+29
| * Fix bit assignment for CE_CONFLICTEDJunio C Hamano2010-01-041-1/+1
| * "reset --merge": fix unmerged caseJunio C Hamano2010-01-035-20/+49
| * reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer2010-01-033-17/+38
| * reset: add a few tests for "git reset --merge"Christian Couder2009-12-301-0/+159
| * Documentation: reset: add some tables to describe the different optionsChristian Couder2009-12-301-0/+66
| * reset: improve mixed reset error message when in a bare repoChristian Couder2009-12-301-0/+4
* | Merge branch 'nd/sparse'Junio C Hamano2010-01-1333-102/+1049
|\ \
| * | t7002: test for not using external grep on skip-worktree pathsNguyễn Thái Ngọc Duy2010-01-062-0/+13
| * | t7002: set test prerequisite "external-grep" if supportedNguyễn Thái Ngọc Duy2010-01-061-0/+12
| * | grep: do not do external grep on skip-worktree entriesNguyễn Thái Ngọc Duy2009-12-301-1/+17
| * | commit: correctly respect skip-worktree bitNguyễn Thái Ngọc Duy2009-12-142-6/+9
| * | ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy2009-12-145-9/+26
| * | tests: rename duplicate t1009Jeff King2009-11-251-0/+0
| * | sparse checkout: inhibit empty worktreeNguyễn Thái Ngọc Duy2009-08-232-7/+10
| * | Add tests for sparse checkoutNguyễn Thái Ngọc Duy2009-08-231-0/+154
| * | read-tree: add --no-sparse-checkout to disable sparse checkout supportNguyễn Thái Ngọc Duy2009-08-232-2/+8
| * | unpack-trees(): ignore worktree check outside checkout areaNguyễn Thái Ngọc Duy2009-08-231-0/+12
| * | unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final indexNguyễn Thái Ngọc Duy2009-08-232-1/+83
| * | unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy2009-08-237-7/+48
| * | unpack-trees.c: generalize verify_* functionsNguyễn Thái Ngọc Duy2009-08-231-5/+18
| * | unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneNguyễn Thái Ngọc Duy2009-08-232-1/+11
| * | Introduce "sparse checkout"Nguyễn Thái Ngọc Duy2009-08-231-0/+44
| * | dir.c: export excluded_1() and add_excludes_from_file_1()Nguyễn Thái Ngọc Duy2009-08-232-16/+20
| * | excluded_1(): support exclude files in indexNguyễn Thái Ngọc Duy2009-08-231-0/+6
| * | unpack-trees(): carry skip-worktree bit over in merged_entry()Nguyễn Thái Ngọc Duy2009-08-231-0/+2
| * | Read .gitignore from index if it is skip-worktreeNguyễn Thái Ngọc Duy2009-08-236-22/+95
| * | Avoid writing to buffer in add_excludes_from_file_1()Nguyễn Thái Ngọc Duy2009-08-231-3/+2
| * | Teach Git to respect skip-worktree bit (writing part)Nguyễn Thái Ngọc Duy2009-08-232-2/+148
| * | Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy2009-08-238-26/+199
| * | Introduce "skip-worktree" bit in index, teach Git to get/set this bitNguyễn Thái Ngọc Duy2009-08-236-3/+109
| * | Add test-index-versionNguyễn Thái Ngọc Duy2009-08-233-0/+16
| * | update-index: refactor mark_valid() in preparation for new optionsNguyễn Thái Ngọc Duy2009-08-231-14/+10
* | | Merge branch 'maint'Junio C Hamano2010-01-124-5/+3
|\ \ \
| * | | remote-curl: Fix Accept header for smart HTTP connectionsShawn O. Pearce2010-01-122-2/+2
| * | | grep: -L should show empty filesJunio C Hamano2010-01-121-2/+0
| * | | rebase--interactive: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-111-1/+1
* | | | lockfile: show absolute filename in unable_to_lock_messageMatthieu Moy2010-01-121-2/+3
* | | | hg-to-git: fix COMMITTER type-oBart Trojanowski2010-01-121-4/+4
* | | | push: spell 'Note about fast-forwards' section name correctly in error message.Matthieu Moy2010-01-111-2/+2
* | | | Merge branch 'tr/http-updates'Junio C Hamano2010-01-103-2/+60
|\ \ \ \
| * | | | Remove http.authAnyJunio C Hamano2009-12-292-23/+1
| * | | | Allow curl to rewind the RPC read bufferMartin Storsjö2009-12-011-0/+30
| * | | | Add an option for using any HTTP authentication scheme, not only basicMartin Storsjö2009-11-272-0/+29
| * | | | http: maintain curl sessionsTay Ray Chuan2009-11-272-2/+23
* | | | | Merge branch 'jk/maint-1.6.5-reset-hard'Junio C Hamano2010-01-102-4/+8
|\ \ \ \ \
| * | | | | reset: unbreak hard resets with GIT_WORK_TREEJeff King2009-12-302-4/+8
* | | | | | Merge branch 'jk/push-to-delete'Junio C Hamano2010-01-103-3/+53
|\ \ \ \ \ \
View Lorry Controller Status