summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-2021-54/+392
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Document that merge strategies can now take their own optionsJunio C Hamano2010-01-172-1/+33
| * | | | | | | | | Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun2010-01-171-1/+46
| * | | | | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-176-18/+91
| * | | | | | | | | pull: Fix parsing of -X<option>Junio C Hamano2010-01-171-7/+14
| * | | | | | | | | Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-172-2/+23
| * | | | | | | | | git merge -X<option>Avery Pennarun2010-01-1711-26/+162
| * | | | | | | | | git-merge-file --ours, --theirsJunio C Hamano2009-11-294-10/+34
| * | | | | | | | | Merge remote branch 'ko/master' into HEADJunio C Hamano2009-11-29320-2456/+15901
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'nd/status-partial-refresh'Junio C Hamano2010-01-203-3/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rm: only refresh entries that we may touchNguyễn Thái Ngọc Duy2010-01-191-1/+2
| * | | | | | | | | | | status: only touch path we may need to checkNguyễn Thái Ngọc Duy2010-01-152-2/+2
* | | | | | | | | | | | Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-20116-685/+693
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10112-647/+647
| * | | | | | | | | | | | Documentation: format full commands in typewriter fontThomas Rast2010-01-1012-28/+28
| * | | | | | | | | | | | Documentation: warn prominently against merging with dirty treesThomas Rast2010-01-092-0/+8
| * | | | | | | | | | | | Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast2010-01-091-17/+17
* | | | | | | | | | | | | Merge branch 'jh/notes' (early part)Junio C Hamano2010-01-204-18/+895
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add more testcases to test fast-import of notesJohan Herland2009-12-071-0/+623
| * | | | | | | | | | | | | Rename t9301 to t9350, to make room for more fast-import testsJohan Herland2009-12-071-0/+0
| * | | | | | | | | | | | | fast-import: Proper notes tree manipulationJohan Herland2009-12-072-18/+272
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maintJunio C Hamano2010-01-201-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | status: don't require the repository to be writableJunio C Hamano2010-01-191-4/+6
* | | | | | | | | | | | | Merge branch 'rr/core-tutorial'Junio C Hamano2010-01-201-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation: Update git core tutorial clarifying reference to scriptsRamkumar Ramachandra2010-01-161-0/+8
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-2014-47/+652
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | rerere forget path: forget recorded resolutionJunio C Hamano2010-01-104-0/+161
| * | | | | | | | | | | | rerere: refactor rerere logic to make it independent from I/OJunio C Hamano2010-01-101-35/+76
| * | | | | | | | | | | | rerere: remove silly 1024-byte line limitJunio C Hamano2009-12-251-9/+10
| * | | | | | | | | | | | resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano2009-12-253-1/+20
| * | | | | | | | | | | | resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-255-0/+77
| * | | | | | | | | | | | resolve-undo: allow plumbing to clear the informationJunio C Hamano2009-12-252-0/+17
| * | | | | | | | | | | | resolve-undo: basic testsJunio C Hamano2009-12-252-1/+130
| * | | | | | | | | | | | resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-258-1/+160
| * | | | | | | | | | | | builtin-merge.c: use standard active_cache macrosJunio C Hamano2009-12-251-3/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'js/exec-error-report'Junio C Hamano2010-01-205-50/+191
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Improve error message when a transport helper was not foundIlari Liusvaara2010-01-121-4/+10
| * | | | | | | | | | | | start_command: detect execvp failures earlyJohannes Sixt2010-01-104-1/+96
| * | | | | | | | | | | | run-command: move wait_or_whine earlierJohannes Sixt2010-01-101-42/+42
| * | | | | | | | | | | | start_command: report child process setup errors to the parent's stderrJohannes Sixt2010-01-101-3/+43
* | | | | | | | | | | | | Merge branch 'jc/ls-files-ignored-pathspec'Junio C Hamano2010-01-202-64/+174
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ls-files: fix overeager pathspec optimizationJunio C Hamano2010-01-082-2/+38
| * | | | | | | | | | | | | read_directory(): further split treat_path()Junio C Hamano2010-01-081-21/+29
| * | | | | | | | | | | | | read_directory_recursive(): refactor handling of a single path into a separat...Junio C Hamano2010-01-081-63/+90
| * | | | | | | | | | | | | t3001: test ls-files -o ignored/dirJunio C Hamano2010-01-081-0/+39
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/grep-lookahead'Junio C Hamano2010-01-207-370/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | grep --no-index: allow use of "git grep" outside a git repositoryJunio C Hamano2010-01-152-0/+78
| * | | | | | | | | | | | | grep: prepare to run outside of a work treeJunio C Hamano2010-01-152-1/+8
| * | | | | | | | | | | | | grep: rip out pessimization to use fixmatch()Junio C Hamano2010-01-131-8/+1
View Lorry Controller Status