projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin
[git] / git-merge-recursive.py
2006-06-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-05-03  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-04-24  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-04-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-04-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-04-05  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-03-31  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-03-26  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-02-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-02-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw
2006-02-02  Fredrik Kuivinenmerge-recursive: Make use of provided bases blob | commitdiff | raw
2006-01-30  Junio C HamanoMerge fixes up to GIT 1.1.6 blob | commitdiff | raw | diff to current
2006-01-30  Junio C HamanoGIT 1.1.6 v1.1.6 blob | commitdiff | raw | diff to current
2006-01-29  Fredrik Kuivinenmerge-recursive: Improve the error message printed... blob | commitdiff | raw | diff to current
2006-01-27  Junio C HamanoGIT 1.1.5 v1.1.5 blob | commitdiff | raw | diff to current
2006-01-20  Junio C HamanoGIT 1.1.4 v1.1.4 blob | commitdiff | raw | diff to current
2006-01-16  Junio C HamanoGIT 1.1.3 v1.1.3 blob | commitdiff | raw | diff to current
2006-01-16  Junio C HamanoMerge branch 'fixo/1.0' blob | commitdiff | raw | diff to current
2006-01-14  Junio C HamanoGIT 1.1.2 v1.1.2 blob | commitdiff | raw | diff to current
2006-01-11  Junio C HamanoGIT 1.1.1 v1.1.1 blob | commitdiff | raw | diff to current
2006-01-08  Junio C HamanoGIT 1.1.0 v1.1.0 blob | commitdiff | raw | diff to current
2006-01-06  Junio C HamanoMerge fixes up to GIT 1.0.7 blob | commitdiff | raw | diff to current
2005-12-28  Junio C HamanoMerge fixes up to GIT 1.0.6 blob | commitdiff | raw | diff to current
2005-12-27  Junio C HamanoMerge fixes up to GIT 1.0.5 blob | commitdiff | raw | diff to current
2005-12-24  Junio C HamanoMerge fixes up to GIT 1.0.4 blob | commitdiff | raw | diff to current
2005-12-23  Junio C HamanoMerge in fixes up to 1.0.3 maintenance branch. blob | commitdiff | raw | diff to current
2005-12-22  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-12-22  Junio C Hamanomerge-recursive: conflicting rename case. blob | commitdiff | raw | diff to current
2005-12-12  Junio C HamanoGIT 0.99.9m aka 1.0rc5 v0.99.9m v1.0rc5 blob | commitdiff | raw | diff to current
2005-12-11  Junio C Hamanomerge-recursive: cleanup setIndexStages blob | commitdiff | raw | diff to current
2005-12-11  Junio C Hamanomerge-recursive: leave unmerged entries in the index. blob | commitdiff | raw | diff to current
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-12-04  Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4 blob | commitdiff | raw | diff to current
2005-12-02  Junio C Hamanomerge-recursive: adjust git-ls-tree use for the latest. blob | commitdiff | raw | diff to current
2005-11-30  Junio C HamanoMerge branch 'jc/subdir' blob | commitdiff | raw | diff to current
2005-11-30  Junio C HamanoMerge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect... blob | commitdiff | raw | diff to current
2005-11-30  Junio C Hamanomerge-recursive: match the unmerged index entry behavio... blob | commitdiff | raw | diff to current
2005-11-29  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-28  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-26  Junio C HamanoGIT 0.99.9k v0.99.9k blob | commitdiff | raw | diff to current
2005-11-22  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-20  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-20  Fredrik Kuivinenmerge-recursive: Replace 'except:' blob | commitdiff | raw | diff to current
2005-11-20  Junio C Hamanomerge-recursive::removeFile: remove empty directories blob | commitdiff | raw | diff to current
2005-11-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-17  Junio C HamanoGIT 0.99.9j aka 1.0rc3 v0.99.9j v1.0rc3 blob | commitdiff | raw | diff to current
2005-11-16  Johannes SchindelinGive python a chance to find "backported" modules blob | commitdiff | raw | diff to current
2005-11-12  Junio C HamanoGIT 0.99.9h v0.99.9h v1.0rc1 blob | commitdiff | raw | diff to current
2005-11-12  Fredrik Kuivinenmerge-recursive: Use '~' instead of '_' to separate... blob | commitdiff | raw | diff to current
2005-11-12  Fredrik Kuivinenmerge-recursive: Add copyright notice blob | commitdiff | raw | diff to current
2005-11-12  Fredrik Kuivinenmerge-recursive: Indent the output properly blob | commitdiff | raw | diff to current
2005-11-10  Junio C HamanoGIT 0.99.9g v0.99.9g blob | commitdiff | raw | diff to current
2005-11-10  Junio C HamanoMerge branch 'hold/svn' blob | commitdiff | raw | diff to current
2005-11-10  Junio C HamanoMerge branch 'hold/rpm' blob | commitdiff | raw | diff to current
2005-11-09  Fredrik Kuivinenmerge-recursive: Fix support for branch names containin... blob | commitdiff | raw | diff to current
2005-11-09  Fredrik Kuivinenmerge-recursive: Fix limited output of rename messages blob | commitdiff | raw | diff to current
2005-11-08  Junio C HamanoMerge branch 'master' blob | commitdiff | raw | diff to current
2005-11-08  Fredrik Kuivinenmerge-recursive: Only print relevant rename messages blob | commitdiff | raw | diff to current
2005-11-07  Junio C HamanoGIT 0.99.9e v0.99.9e blob | commitdiff | raw | diff to current
2005-10-31  Junio C HamanoGIT 0.99.9a v0.99.9a blob | commitdiff | raw | diff to current
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-10-23  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-21  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-18  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-16  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-16  Junio C HamanoMerge branch 'svn' of netz.smurf.noris.de/git/git blob | commitdiff | raw | diff to current
2005-10-15  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-12  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-10  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-10  Junio C HamanoDeal with $(bindir) and friends with whitespaces. blob | commitdiff | raw | diff to current
2005-10-03  Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git blob | commitdiff | raw | diff to current
2005-10-02  Fredrik Kuivinen[PATCH] Teach the recursive merge strategy about renames. blob | commitdiff | raw | diff to current
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-09-25  Fredrik Kuivinen[PATCH] recursive-merge: Don't print a stack trace... blob | commitdiff | raw | diff to current
2005-09-14  Junio C HamanoMerge branch 'master' of . blob | commitdiff | raw | diff to current
2005-09-14  Junio C Hamanogit-merge-recursive: Trivial RE fixes. blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Use a temporary index file when we merge the... blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Adjust git-merge-recursive.py for the new tool... blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Don't output 'Automatic merge failed, ...' blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Be more like the 'resolve' strategy. blob | commitdiff | raw | diff to current
2005-09-13  Fredrik Kuivinen[PATCH] Rename the 'fredrik' merge strategy to 'recursive'. blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.