Andrew's git / gitweb.git / search
?
merge-recursive: Structure process_df_entry() to handle more cases
2010-09-30 merge-recursive: Structure process_df_entry() to handle...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: Have process_entry() skip D/F or rename...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: New function to assist resolving renames...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: New data structures for deferring...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: Move process_entry's content merging...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: Move delete/modify handling into dedicated...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: Move rename/delete handling into dedicated...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: Nuke rename/directory conflict detection
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: Rename conflict_rename_rename*() for...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: Small code clarification -- variable...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6036: Add testcase for undetected conflict
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6036: Add a second testcase similar to the first but...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6036: Test index and worktree state, not just that...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6020: Add a testcase for modify/delete + directory...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6020: Modernize style a bit
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6022: Add tests for rename/rename combined with D...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6022: Add paired rename+D/F conflict: (two/file, one...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6022: Add tests with both rename source & dest involved...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6022: Add tests for reversing order of merges when...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6022: Add test combinations of {content conflict?...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t6032: Add a test checking for excessive output from...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 merge-recursive: Restructure showing how to chain more...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 t3030: Add a testcase for resolvable rename/add conflict...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-30 Merge branch 'en/rename-d-f' into en/merge-recursive
 diff | tree
2010-09-18 Git 1.7.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-18 Merge branch 'js/ls-files-x-doc'
 diff | tree
2010-09-17 git-rebase--interactive.sh: replace cut with ${v%% *}
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-17 t/t7300: workaround ancient touch by rearranging arguments
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-16 Merge branch 'bg/fix-t7003'
 diff | tree
2010-09-16 ls-files documentation: reword for consistency
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-16 git-ls-files.txt: clarify -x/--exclude option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-15 Git 1.7.3 rc2
 diff | tree
2010-09-15 Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
 diff | tree
2010-09-15 Merge branch 'os/fix-rebase-diff-no-prefix'
 diff | tree
2010-09-15 Merge branch 'jl/fix-test'
 diff | tree
2010-09-15 Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
 diff | tree
2010-09-15 Merge branch 'ch/maint-cannot-create-bundle-error'
 diff | tree
2010-09-15 Merge branch 'ks/recursive-rename-add-identical'
 diff | tree
2010-09-15 Merge git://repo.or.cz/git-gui
 diff | tree
2010-09-13 t7003: Use test_commit instead of custom function
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-12 Merge branch 'maint'
 diff | tree
2010-09-12 ls-tree $di $dir: do not mistakenly recurse into directories
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-12 t3101: modernise style
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-12 vcs-svn: Fix some printf format compiler warnings
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-11 compat/nedmalloc: don't force NDEBUG on the rest of git
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 Git 1.7.3 rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 Merge branch 'np/relnotes-in-subdir'
 diff | tree
2010-09-10 Prepare for 1.7.3 rc1
 diff | tree
2010-09-10 Merge branch 'maint'
 diff | tree
2010-09-10 config.txt: fix placement of diff.noprefix
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 t/t4018: avoid two unnecessary sub-shell invocations
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 Merge branch 'maint'
 diff | tree
2010-09-10 t/t4018: test whether the word_regex patterns compile
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 xdiff-interface.c: always trim trailing space from...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 diff.c: call regfree to free memory allocated by regcomp...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 t/t5510-fetch.sh: improve testing with explicit URL...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 builtin/fetch.c: comment that branch->remote_name is...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 Makefile: use compat regex on IRIX 6.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 t/t7008: workaround broken handling of \000 by printf...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 Add --src/dst-prefix to git-formt-patch in git-rebase.sh
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 merge-recursive: D/F conflicts where was_a_dir/file...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-10 t3509: Add rename + D/F conflict testcase that recursive...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-09 install-webdoc: keep installed RelNotes-*.txt
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-09 t1020: Get rid of 'cd "$HERE"' at the start of each...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-09 t2016 (checkout -p): add missing &&
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-09 t1302 (core.repositoryversion): style tweaks
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-09 t2105 (gitfile): add missing &&
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-09 t1450 (fsck): remove dangling objects
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-09 tests: subshell indentation stylefix
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-08 Merge branch 'tf/cleanup-builtin-help-headers'
 diff | tree
2010-09-08 Merge branch 'jk/test-must-fail-missing'
 diff | tree
2010-09-08 Merge branch 'jh/error-removing-missing-note'
 diff | tree
2010-09-08 Merge branch 'kf/askpass-config'
 diff | tree
2010-09-08 Merge branch 'bc/maint-fetch-url-only'
 diff | tree
2010-09-08 Merge branch 'jk/maint-pass-c-config-in-env'
 diff | tree
2010-09-08 Merge branch 'en/d-f-conflict-fix'
 diff | tree
2010-09-08 fast-export: ensure that a renamed file is printed...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-07 Documentation: move RelNotes into a directory of their own
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-07 Merge branch 'maint'
 diff | tree
2010-09-07 revert: Fix trivial comment style issue
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-07 cache_tree_free: Fix small memory leak
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-06 Merge branch 'jh/clean-exclude'
 diff | tree
2010-09-06 builtin/clean.c: Use STRING_LIST_INIT_NODUP.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-06 Merge branch 'jl/maint-fix-test'
 diff | tree
2010-09-06 Several tests: cd inside subshell instead of around
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-06 t3404 & t7508: cd inside subshell instead of around
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-06 Merge branch 'maint'
 diff | tree
2010-09-06 Merge branch 'xx/trivial' into maint
 diff | tree
2010-09-06 tag.c: whitespace breakages fix
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-06 Fix whitespace issue in object.c
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-06 t5505: add missing &&
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-04 Merge branch 'jl/submodule-ignore-diff'
 diff | tree
2010-09-04 Merge branch 'ab/test-2'
 diff | tree
2010-09-04 Merge branch 'js/detached-stash'
 diff | tree
2010-09-04 Merge branch 'js/maint-reflog-beyond-horizon'
 diff | tree
2010-09-04 Merge branch 'dg/local-mod-error-messages'
 diff | tree
2010-09-04 Merge branch 'nd/maint-fix-replace'
 diff | tree
2010-09-04 parse_object: pass on the original sha1, not the replaced one
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-03 RE: [PATCH] Avoid rename/add conflict when contents...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 diff | tree
2010-09-03 Merge branch 'ab/compat-regex'
 diff | tree