Andrew's git / gitweb.git / search
?
merge-recursive: Avoid unnecessary file rewrites
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
2011-08-14 t6042: Add a pair of cases where undetected renames...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-08-14 t6042: Add failing testcase for rename/modify/add-source...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-08-14 t6042: Add a testcase where git deletes an untracked...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-06-09 fetch: do not leak a refspec
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-06-01 Git 1.7.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-06-01 Merge branch 'jk/maint-config-alias-fix' into maint
 diff | tree
2011-06-01 Merge branch 'jc/fmt-req-fix' into maint
 diff | tree
2011-06-01 Merge branch 'jk/maint-docs' into maint
 diff | tree
2011-06-01 Merge branch 'jn/doc-remote-helpers' into maint
 diff | tree
2011-06-01 Merge branch 'kk/maint-prefix-in-config-mak' into maint
 diff | tree
2011-06-01 diffcore-rename.c: avoid set-but-not-used warning
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-31 Start 1.7.5.4 draft release notes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-31 Merge branch 'tr/add-i-no-escape' into maint
 diff | tree
2011-05-31 Merge branch 'vh/config-interactive-singlekey-doc'...
diff | tree
2011-05-31 Merge branch 'ml/test-readme' into maint
 diff | tree
2011-05-31 Merge branch 'ab/i18n-fixup' into maint
 diff | tree
2011-05-31 Merge branch 'jc/rename-degrade-cc-to-c' into maint
 diff | tree
2011-05-31 Merge branch 'rr/doc-content-type' into maint
 diff | tree
2011-05-30 Documentation: do not misinterpret refspecs as bold...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-30 Merge branch 'jm/maint-misc-fix' into maint
 diff | tree
2011-05-30 Merge branch 'bc/maint-submodule-fix-parked' into maint
 diff | tree
2011-05-30 Merge branch 'bc/maint-api-doc-parked' into maint
 diff | tree
2011-05-30 Merge branch 'jn/run-command-error-failure' into maint
 diff | tree
2011-05-27 config.mak.in: allow "configure --sysconfdir=/else...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-27 docs: fix some antique example output
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-27 docs: make sure literal "->" isn't converted to arrow
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-27 docs: update status --porcelain format
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-27 docs: minor grammar fixes to git-status
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-26 git-submodule.sh: separate parens by a space to avoid...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-26 Documentation/technical/api-diff.txt: correct name...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-26 read_gitfile_gently: use ssize_t to hold read result
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-26 remove tests of always-false condition
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-26 rerere.c: diagnose a corrupt MERGE_RR when hitting...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-26 Git 1.7.5.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2011-05-26 Merge branch 'maint-1.7.4' into maint
 diff | tree
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
diff | tree
2011-05-26 Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
diff | tree
2011-05-26 Merge branch 'jk/maint-upload-pack-shallow' into maint...
diff | tree
2011-05-26 Merge branch 'jm/maint-diff-words-with-sbe' into maint
 diff | tree
2011-05-26 Merge branch 'kk/maint-prefix-in-config-mak' into maint
 diff | tree
2011-05-26 Merge branch 'mg/diff-uiconfig-doc' into maint
 diff | tree
2011-05-26 Merge branch 'ft/gitweb-tar-with-gzip-n' into maint
 diff | tree
2011-05-26 Merge branch 'ss/doc-svn' into maint
 diff | tree
2011-05-26 Merge branch 'jn/format-patch-doc' into maint
 diff | tree
2011-05-26 Merge branch 'jc/maint-pathspec-stdin-and-cmdline'...
diff | tree
2011-05-26 Merge branch 'jk/cherry-pick-root-with-resolve' into...
diff | tree
2011-05-26 Merge branch 'rg/copy-gecos-username' into maint
 diff | tree
2011-05-26 Merge branch 'fc/completion-zsh' into maint
 diff | tree
2011-05-26 Merge branch 'jk/git-connection-deadlock-fix' into...
diff | tree