summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff/status: print submodule path when looking for changes failsjl/submodule-status-failure-reportJens Lehmann2011-12-081-2/+2
* Show submodules as modified when they contain a dirty work treeJens Lehmann2010-01-164-17/+124
* Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-137-5/+222
|\
| * rebase -i: teach --onto A...B syntaxNanako Shiraishi2010-01-072-1/+50
| * rebase: fix --onto A...B parsing and add testsNanako Shiraishi2010-01-072-14/+94
| * "rebase --onto A...B" replays history on the merge base between A and BJunio C Hamano2009-11-211-1/+18
| * "checkout A...B" switches to the merge base between A and BJunio C Hamano2009-10-184-3/+74
* | Merge branch 'rs/maint-archive-match-pathspec'Junio C Hamano2010-01-131-1/+24
|\ \
| * | archive: complain about path specs that don't match anythingRené Scharfe2009-12-301-1/+24
* | | Merge branch 'il/vcs-helper'Junio C Hamano2010-01-137-93/+505
|\ \ \
| * | | Reset possible helper before reusing remote structureIlari Liusvaara2010-01-091-0/+3
| * | | Remove special casing of http, https and ftpIlari Liusvaara2009-12-283-10/+29
| * | | Support remote archive from all smart transportsIlari Liusvaara2009-12-284-7/+55
| * | | Support remote helpers implementing smart transportsIlari Liusvaara2009-12-282-7/+142
| * | | Support taking over transportsIlari Liusvaara2009-12-093-6/+66
| * | | Refactor git transport options parsingIlari Liusvaara2009-12-092-31/+62
| * | | Pass unknown protocols to external protocol handlersIlari Liusvaara2009-12-092-16/+72
| * | | Support mandatory capabilitiesIlari Liusvaara2009-12-092-7/+23
| * | | Add remote helper debug modeIlari Liusvaara2009-12-091-25/+69
| * | | Merge branch 'master' into il/vcs-helperJunio C Hamano2009-12-06308-2343/+14152
| |\ \ \
* | \ \ \ 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
View Lorry Controller Status