aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2010-01-16
| * | | | | | | xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-16
| * | | | | | | xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
| * | | | | | | git_attr(): fix function signatureJunio C Hamano2010-01-16
* | | | | | | | Merge branch 'ag/maint-apply-too-large-p'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-apply.c: Skip filenames without enough componentsAndreas Gruenbacher2010-01-18
* | | | | | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Document that merge strategies can now take their own optionsJunio C Hamano2010-01-17
| * | | | | | | | | Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun2010-01-17
| * | | | | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-17
| * | | | | | | | | pull: Fix parsing of -X<option>Junio C Hamano2010-01-17
| * | | | | | | | | Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-17
| * | | | | | | | | git merge -X<option>Avery Pennarun2010-01-17
| * | | | | | | | | git-merge-file --ours, --theirsJunio C Hamano2009-11-29
| * | | | | | | | | Merge remote branch 'ko/master' into HEADJunio C Hamano2009-11-29
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'nd/status-partial-refresh'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rm: only refresh entries that we may touchNguyễn Thái Ngọc Duy2010-01-19
| * | | | | | | | | | | status: only touch path we may need to checkNguyễn Thái Ngọc Duy2010-01-15
* | | | | | | | | | | | Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10
| * | | | | | | | | | | | Documentation: format full commands in typewriter fontThomas Rast2010-01-10
| * | | | | | | | | | | | Documentation: warn prominently against merging with dirty treesThomas Rast2010-01-09
| * | | | | | | | | | | | Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast2010-01-09
* | | | | | | | | | | | | Merge branch 'jh/notes' (early part)Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add more testcases to test fast-import of notesJohan Herland2009-12-07
| * | | | | | | | | | | | | Rename t9301 to t9350, to make room for more fast-import testsJohan Herland2009-12-07
| * | | | | | | | | | | | | fast-import: Proper notes tree manipulationJohan Herland2009-12-07
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maintJunio C Hamano2010-01-20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | status: don't require the repository to be writableJunio C Hamano2010-01-19
* | | | | | | | | | | | | Merge branch 'rr/core-tutorial'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation: Update git core tutorial clarifying reference to scriptsRamkumar Ramachandra2010-01-16
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | rerere forget path: forget recorded resolutionJunio C Hamano2010-01-10
| * | | | | | | | | | | | rerere: refactor rerere logic to make it independent from I/OJunio C Hamano2010-01-10
| * | | | | | | | | | | | rerere: remove silly 1024-byte line limitJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: allow plumbing to clear the informationJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: basic testsJunio C Hamano2009-12-25
| * | | | | | | | | | | | resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-25
| * | | | | | | | | | | | builtin-merge.c: use standard active_cache macrosJunio C Hamano2009-12-25
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'js/exec-error-report'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Improve error message when a transport helper was not foundIlari Liusvaara2010-01-12
| * | | | | | | | | | | | start_command: detect execvp failures earlyJohannes Sixt2010-01-10
| * | | | | | | | | | | | run-command: move wait_or_whine earlierJohannes Sixt2010-01-10
| * | | | | | | | | | | | start_command: report child process setup errors to the parent's stderrJohannes Sixt2010-01-10
* | | | | | | | | | | | | Merge branch 'jc/ls-files-ignored-pathspec'Junio C Hamano2010-01-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ls-files: fix overeager pathspec optimizationJunio C Hamano2010-01-08
| * | | | | | | | | | | | | read_directory(): further split treat_path()Junio C Hamano2010-01-08
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 15:21:27 +0000