Andrew's git
/
gitweb.git
/ search
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
diff-index: enable recursive pathspec matching in unpack_trees
2011-08-18
Merge branch 'js/sh-style'
diff
|
tree
2011-08-18
Merge branch 'js/ref-namespaces'
diff
|
tree
2011-08-18
Merge branch 'cb/maint-quiet-push'
diff
|
tree
2011-08-18
Merge branch 'jc/maint-combined-diff-work-tree'
diff
|
tree
2011-08-18
Merge branch 'cb/maint-exec-error-report'
diff
|
tree
2011-08-18
Merge branch 'maint'
diff
|
tree
2011-08-18
Merge branch 'rc/histogram-diff' into HEAD
diff
|
tree
2011-08-18
xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_re...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-17
doc/fast-import: document feature import-marks-if-exists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-17
checkout-index: remove obsolete comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-16
Sync with "maint"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-16
Merge branch 'maint'
diff
|
tree
2011-08-16
merge-recursive: take advantage of hardcoded empty...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-16
Prepare for 1.7.6.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-16
Merge branch 'jk/tag-list-multiple-patterns' into maint
diff
|
tree
2011-08-16
Merge branch 'jl/submodule-update-quiet' into maint
diff
|
tree
2011-08-16
Merge branch 'jl/submodule-add-relurl-wo-upstream'...
diff
|
tree
2011-08-16
Merge branch 'oa/pull-reflog' into maint
diff
|
tree
2011-08-16
Merge branch 'js/ls-tree-error' into maint
diff
|
tree
2011-08-16
Merge branch 'jk/fast-export-quote-path' into maint
diff
|
tree
2011-08-16
Merge branch 'jc/checkout-reflog-fix' into maint
diff
|
tree
2011-08-16
Merge branch 'jc/maint-reset-unmerged-path' into maint
diff
|
tree
2011-08-16
Merge branch 'mz/doc-rebase-abort' into maint
diff
|
tree
2011-08-16
Merge branch 'bw/log-all-ref-updates-doc' into maint
diff
|
tree
2011-08-16
Merge branch 'js/maint-add-path-stat-pwd' into maint
diff
|
tree
2011-08-16
Merge branch 'ms/help-unknown' into maint
diff
|
tree
2011-08-16
Merge branch 'mz/doc-synopsis-verse' into maint
diff
|
tree
2011-08-16
Merge branch 'jn/mime-type-with-params' into maint
diff
|
tree
2011-08-16
Merge branch 'jc/submodule-sync-no-auto-vivify' into...
diff
|
tree
2011-08-16
Merge branch 'jc/zlib-wrap' into maint
diff
|
tree
2011-08-16
Merge branch 'fk/relink-upon-ldflags-update' into maint
diff
|
tree
2011-08-16
Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
diff
|
tree
2011-08-16
Merge branch 'aw/rebase-i-p' into maint
diff
|
tree
2011-08-16
Merge branch 'jc/diff-index-quick-exit-early' into...
diff
|
tree
2011-08-16
Merge branch 'jk/combine-diff-binary-etc' into maint
diff
|
tree
2011-08-16
am: refresh the index at start and --resolved
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-16
revert: plug memory leak in "cherry-pick root commit...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
Unroll the loop over passes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
Change while loop into for loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
Determine the start of the states outside of the pass...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
Change parse_attr() to take a pointer to struct attr_state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
Increment num_attr in parse_attr_line(), not parse_attr()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
Document struct match_attr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
Add a file comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
fast-import: prevent producing bad delta
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
fast-import: add a test for tree delta base corruption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Don't re-sort a list whose order we...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Fix virtual merge base for rename...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6036: criss-cross + rename/rename(1to2)/add-dest ...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Avoid unnecessary file rewrites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6022: Additional tests checking for unnecessary updates...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Fix spurious 'refusing to lose untracked...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6022: Add testcase for spurious "refusing to lose...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t3030: fix accidental success in symlink rename
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Fix working copy handling for rename...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: add handling for rename/rename/add...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Have conflict_rename_delete reuse...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Make modify/delete handling code reusable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Consider modifications in rename/rename...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Create function for merging with branchname...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Record more data needed for merging...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Defer rename/rename(2to1) handling...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Small cleanups for conflict_rename_rename_1to2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Fix rename/rename(1to2) resolution...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Introduce a merge_file convenience...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Fix modify/delete resolution in the...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: When we detect we can skip an update...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Provide more info in conflict markers...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Cleanup and consolidation of rename_conflic...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Consolidate process_entry() and process_df_...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Improve handling of rename target...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Add comments about handling rename...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Make dead code for rename/rename(2to1...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Fix deletion of untracked file in...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Split update_stages_and_entry; only...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Allow make_room_for_path() to remove...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
string-list: Add API to remove an item from an unsorted...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Split was_tracked() out of would_lose_untra...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Save D/F conflict filenames instead...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Fix code checking for D/F conflicts...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Fix sorting order and directory change...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Fix recursive case with D/F conflict...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Avoid working directory changes during...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Remember to free generated unique...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Consolidate different update_stages...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Mark some diff_filespec struct arguments...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Correct a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
merge-recursive: Make BUG message more legible by adding...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6022: Add testcase for merging a renamed file with...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6022: New tests checking for unnecessary updates of...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6022: Remove unnecessary untracked files to make test...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6036: criss-cross + rename/rename(1to2)/add-source...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6036: criss-cross w/ rename/rename(1to2)/modify+rename...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6036: tests for criss-cross merges with various directory...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6036: criss-cross with weird content can fool git...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6036: Add differently resolved modify/delete conflict...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6042: Add failing testcases for rename/rename/add...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6042: Ensure rename/rename conflicts leave index and...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6042: Add tests for content issues with modify/rename...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree
2011-08-14
t6042: Add a testcase where undetected rename causes...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
diff
|
tree