?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
merge-recursive: handle D/F conflict case more carefully.
2007-04-10 Junio C Hamanomerge-recursive: handle D/F conflict case more carefully.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-10 Junio C Hamanomerge-recursive: do not barf on "to be removed" entries.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-10 Junio C HamanoTreat D/F conflict entry more carefully in unpack-trees...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-10 Junio C Hamanot1000: fix case table.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-09 Junio C HamanoMerge branch 'jc/push'
 commit | commitdiff | tree
2007-04-09 Junio C HamanoMerge branch 'jc/merge-subtree'
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-09 Junio C HamanoMerge branch 'js/fetch-progress'
 commit | commitdiff | tree
2007-04-09 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2007-04-09 Junio C HamanoAdd Documentation/cmd-list.made to .gitignore
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-08 Junio C HamanoStart 1.5.2 cycle by prepareing RelNotes for it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-08 Junio C HamanoMerge branch 'jc/read-tree-df' (early part)
 commit | commitdiff | tree
2007-04-08 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2007-04-08 Junio C HamanoPrepare for 1.5.1.1
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-07 Junio C HamanoA new merge stragety 'subtree'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-07 Junio C Hamanogit-push to multiple locations does not stop at the...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-07 Junio C Hamanogit-push reports the URL after failing.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-07 Junio C HamanoMerge branch 'jc/index-output'
 commit | commitdiff | tree
2007-04-07 Junio C HamanoMerge branch 'fp/make-j'
 commit | commitdiff | tree
2007-04-07 Junio C HamanoMerge branch 'cc/bisect'
 commit | commitdiff | tree
2007-04-07 Junio C HamanoMerge branch 'jc/checkout' (early part)
 commit | commitdiff | tree
2007-04-07 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2007-04-07 Junio C HamanoDocumentation: tighten dependency for git.{html,txt}
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-07 Junio C Hamanogit-bisect: allow bisecting with only one bad commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-07 Junio C Hamanot6030: add a bit more tests to git-bisect
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-06 Junio C Hamanogit-bisect: modernization
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-05 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2007-04-05 Junio C HamanoRename add_file_to_index() to add_file_to_cache()
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-05 Junio C HamanoRename static variable write_index to update_index...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-05 Junio C HamanoRename internal function "add_file_to_cache" in builtin...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-05 Junio C HamanoPropagate cache error internal to refresh_cache() via...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-05 Junio C HamanoFix bogus error message from merge-recursive error...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-05 Junio C HamanoFix dependency of common-cmds.h
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C HamanoRPM spec: include git-p4 in the list of all packages.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C Hamanorerere: make sorting really stable.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C HamanoFix switching to a branch with D/F when current branch...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C HamanoFix twoway_merge that passed d/f conflict marker to...
commit | commitdiff | tree
2007-04-04 Junio C HamanoFix read-tree --prefix=dir/.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C Hamanounpack-trees: get rid of *indpos parameter.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C Hamanounpack_trees.c: pass unpack_trees_options structure...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C Hamanoadd_cache_entry(): removal of file foo does not conflict...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C HamanoMerge branch 'jc/bisect'
 commit | commitdiff | tree
2007-04-04 Junio C HamanoMerge branch 'fl/doc'
 commit | commitdiff | tree
2007-04-04 Junio C HamanoMerge branch 'post1.5.1/blame.el'
 commit | commitdiff | tree
2007-04-04 Junio C HamanoMerge branch 'post1.5.1/tcltk'
 commit | commitdiff | tree
2007-04-04 Junio C HamanoMerge branch 'post1.5.1/p4'
 commit | commitdiff | tree
2007-04-04 Junio C HamanoMerge branch 'lt/dirwalk'
 commit | commitdiff | tree
2007-04-04 Junio C Hamanogit-read-tree --index-output=<file>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C Hamano_GIT_INDEX_OUTPUT: allow plumbing to output to an alternativ...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C Hamanocheckout: allow detaching to HEAD even when switching...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C HamanoGIT 1.5.1
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C HamanoMerge 1.5.0.7 in
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C HamanoGIT 1.5.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-04 Junio C Hamanorerere should not repeat the earlier hunks in later...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-02 Junio C HamanoHopefully final update to the draft Release Notes,...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-04-01 Junio C HamanoOptional Tck/Tk: ignore generated files.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-30 Junio C HamanoDo not bother documenting fetch--tool
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-30 Junio C HamanoUpdate draft release notes for 1.5.1
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-30 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2007-03-30 Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/mergetool.git
 commit | commitdiff | tree
2007-03-28 Junio C HamanoDocumentation: unbreak user-manual.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-28 Junio C HamanoGIT 1.5.1-rc3
 commit | commitdiff | tree
2007-03-28 Junio C HamanoUpdate main git.html page to point at 1.5.0.6 documentation
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-28 Junio C HamanoMerge branch 'maint' to synchronize with 1.5.0.6
 commit | commitdiff | tree
2007-03-28 Junio C HamanoGIT 1.5.0.6
 commit | commitdiff | tree
2007-03-28 Junio C HamanoFix "--pretty=format:" for parent related items.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-28 Junio C Hamanogit-commit: "read-tree -m HEAD" is not the right way...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-27 Junio C Hamanosha1_file.c (write_sha1_file): Detect close failure
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-27 Junio C HamanoDocument git-log --first-parent
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-26 Junio C HamanoGIT 1.5.1-rc2
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-26 Junio C HamanoMerge branch 'jc/fpl'
 commit | commitdiff | tree
2007-03-26 Junio C HamanoUpdate README to point at a few key periodical messages...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-25 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2007-03-25 Junio C HamanoMerge branch 'maint' of git://linux-nfs.org/~bfields...
commit | commitdiff | tree
2007-03-25 Junio C HamanoMerge branch 'js/remote-show-push'
 commit | commitdiff | tree
2007-03-25 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2007-03-24 Junio C Hamanogit-am documentation: describe what is taken from where.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-24 Junio C Hamanomake the previous optimization work also on path-limited...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-24 Junio C Hamanorev-list --bisect: Fix "halfway" optimization.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-24 Junio C HamanoMerge branch 'master' into jc/bisect
 commit | commitdiff | tree
2007-03-24 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2007-03-24 Junio C HamanoFix path-limited "rev-list --bisect" termination condition.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-23 Junio C Hamanogit-bisect.sh: properly dq $GIT_DIR
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-23 Junio C Hamanogit-bisect: typofix
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-23 Junio C Hamanocheckout: report where the new HEAD is upon detaching...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-23 Junio C Hamanot6004: add a bit more path optimization test.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-23 Junio C Hamanogit-apply: Do not free the wrong buffer when we convert...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-22 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
 commit | commitdiff | tree
2007-03-22 Junio C HamanoMerge branch 'maint'
 commit | commitdiff | tree
2007-03-22 Junio C Hamanogit-rebase: make 'rebase HEAD branch' work as expected.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-22 Junio C Hamanogit-rev-list --bisect: optimization
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-22 Junio C Hamanogit-rev-list: add --bisect-vars option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-22 Junio C Hamanot6002: minor spelling fix.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-22 Junio C Hamanotree_entry_interesting(): allow it to say "everything...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-22 Junio C Hamanotree-diff: avoid strncmp()
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-22 Junio C HamanoTeach tree_entry_interesting() that the tree entries...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-21 Junio C Hamanoblame: cmp_suspect is not "cmp" anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-20 Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
 commit | commitdiff | tree
2007-03-20 Junio C Hamanoblame: micro-optimize cmp_suspect()
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-19 Junio C HamanoGIT 1.5.1-rc1
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2007-03-19 Junio C HamanoFix merge-index
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
next
Dscho's miscellaneous git branches