?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge branch 'bc/git-p4-for-python-2.4' into maint
2013-01-14 Phil Hordrebase --preserve-merges: keep all merge commits including...
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2012-10-29 Phil HordAdd tests for submodule sync --recursive
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2012-10-29 Phil HordTeach --recursive to submodule sync
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2012-10-29 Phil Hordt7407: Fix recursive submodule test
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2012-10-25 Phil Hordgit-pull: Avoid merge-base on detached head
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2012-08-17 Phil Hordstash: invoke rerere in case of conflict
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2012-08-17 Phil Hordtest: git-stash conflict sets up rerere
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2012-03-08 Phil Hordrerere: Document 'rerere remaining'
Signed-off-by: Phil Hord <phil.hord@gmail.com>
 commit | commitdiff | tree
2012-02-22 Phil Hordcherry-pick: No advice to commit if --no-commit
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2011-10-04 Phil HordAdd test showing git-fetch groks gitfiles
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2011-10-04 Phil HordTeach transport about the gitfile mechanism
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
2011-10-04 Phil HordLearn to handle gitfiles in enter_repo
Signed-off-by: Phil Hord <hordp@cisco.com>
 commit | commitdiff | tree
MinGW port of GIT