Andrew's git / gitweb.git / history
?
Explicitly add the default "git pull" behaviour to .git/config on clone
[gitweb.git] / git-merge.sh
2006-03-02 Merge branch 'maint' blob | diff | raw
2006-03-02 Merge branch 'jc/tag' blob | diff | raw
2006-03-02 Merge branch 'jc/tag' into next blob | diff | raw
2006-03-02 Up to date with GIT 1.2.4 fixes blob | diff | raw
2006-03-02 Merge early parts of 'np/delta' branch blob | diff | raw
2006-03-01 Merge git-mv fixes from 'maint' blob | diff | raw
2006-02-28 Merge part of np/delta blob | diff | raw
2006-02-26 Merge branch 'maint' blob | diff | raw
2006-02-25 Merge branches 'jc/rev-list' and 'jc/pack-thin' blob | diff | raw
2006-02-25 Merge branches 'jc/rev-list' and 'jc/pack-thin' blob | diff | raw
2006-02-24 Merge fixes early for next maint series. blob | diff | raw
2006-02-24 Merge branch 'fix' into maint blob | diff | raw | diff to current
2006-02-24 Merge branches 'jc/rev-list' and 'jc/pack-thin' into... blob | diff | raw
2006-02-24 Merge fix bits from jc/rev-list blob | diff | raw
2006-02-24 Merge branch 'np/delta' into next blob | diff | raw
2006-02-24 Merge branch 'ar/win' blob | diff | raw
2006-02-24 Merge branch 'jc/send-insane-refs' blob | diff | raw
2006-02-24 Merge fixes early for next maint series. blob | diff | raw
2006-02-24 Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak... blob | diff | raw | diff to current
2006-02-23 Merge part of pack-thin branch blob | diff | raw
2006-02-23 Merge branch 'np/delta' into next blob | diff | raw
2006-02-23 Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix... blob | diff | raw
2006-02-23 Merge branch 'ra/anno' blob | diff | raw | diff to current
2006-02-23 checkout - eye candy. blob | diff | raw | diff to current
2006-02-23 Merge fixes up to GIT 1.2.3 blob | diff | raw | diff to current
2006-02-22 Keep Porcelainish from failing by broken ident after... blob | diff | raw | diff to current
2006-02-22 Merge branch 'ra/anno' into next blob | diff | raw | diff to current
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-02-22 Merge branch 'fix' blob | diff | raw | diff to current
2006-02-22 Merge branch 'jc/perl' blob | diff | raw | diff to current
2006-02-22 Merge branch 'jc/pack-reuse' blob | diff | raw | diff to current
2006-02-22 Merge branch 'jc/nostat' blob | diff | raw | diff to current
2006-02-22 Merge branch 'js/portable' blob | diff | raw | diff to current
2006-02-21 Merge part of jc/portable branch blob | diff | raw | diff to current
2006-02-21 Merge branch 'lt/merge-tree' blob | diff | raw | diff to current
2006-02-21 Merge branch 'jc/ident' blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/perl' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'ra/anno' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/pack-thin' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/pack-thin' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/rev-list' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'js/portable' into next blob | diff | raw | diff to current
2006-02-20 Merge branch 'jc/merge-msg' into next blob | diff | raw | diff to current
2006-02-19 Merge branch 'jc/mv' into next blob | diff | raw | diff to current
2006-02-19 Merge part of js/portable into next blob | diff | raw | diff to current
2006-02-19 Optionally work without python blob | diff | raw | diff to current
2006-02-19 Merge branch 'jc/ident' into next blob | diff | raw | diff to current
2006-02-19 Keep Porcelainish from failing by broken ident after... blob | diff | raw | diff to current
2006-02-13 Merge branch 'jc/nostat' blob | diff | raw | diff to current
2006-02-12 Merge branch 'master' blob | diff | raw | diff to current
2006-02-12 Only call git-rerere if $GIT_DIR/rr-cache exists. blob | diff | raw | diff to current
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2006-02-07 git-rerere: reuse recorded resolve. blob | diff | raw | diff to current
2006-02-04 Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws' blob | diff | raw | diff to current
2006-02-04 git-merge: Properly quote $merge_msg variable. blob | diff | raw | diff to current
2006-01-30 Merge fixes up to GIT 1.1.6 blob | diff | raw | diff to current
2006-01-28 merge: seed the commit message with list of conflicted... blob | diff | raw | diff to current
2005-12-26 Merge branch 'jc/checkout' blob | diff | raw | diff to current
2005-12-24 Merge fixes up to GIT 1.0.4 blob | diff | raw | diff to current
2005-12-24 GIT 1.0.4 v1.0.4 blob | diff | raw | diff to current
2005-12-23 merge --no-commit: tweak message blob | diff | raw | diff to current
2005-12-15 GIT 0.99.9n aka 1.0rc6 v0.99.9nv1.0rc6 blob | diff | raw | diff to current
2005-12-14 Merge branch 'hold/am' blob | diff | raw | diff to current
2005-12-14 Merge branch 'fk/usage' blob | diff | raw | diff to current
2005-12-14 Trivial usage string clean-up blob | diff | raw | diff to current
2005-12-14 [PATCH] allow merging any committish blob | diff | raw | diff to current
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-12-04 GIT 0.99.9l aka 1.0rc4 v0.99.9lv1.0rc4 blob | diff | raw | diff to current
2005-12-03 git-merge: Exit with code 2 if no strategy was able... blob | diff | raw | diff to current
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-26 GIT 0.99.9k v0.99.9k blob | diff | raw | diff to current
2005-11-25 git-sh-setup: die if outside git repository. blob | diff | raw | diff to current
2005-11-24 git-merge: make recursive the default strategy blob | diff | raw | diff to current
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-11-10 GIT 0.99.9g v0.99.9g blob | diff | raw | diff to current
2005-11-10 Use 'merge-base --all' where applicable. blob | diff | raw | diff to current
2005-11-07 GIT 0.99.9e v0.99.9e blob | diff | raw | diff to current
2005-11-03 GIT 0.99.9c v0.99.9c blob | diff | raw | diff to current
2005-11-03 Add 'ours' merge strategy. blob | diff | raw | diff to current
2005-11-03 Add --no-commit to git-merge/git-pull. blob | diff | raw | diff to current
2005-10-31 GIT 0.99.9a v0.99.9a blob | diff | raw | diff to current
2005-10-28 Documentation changes to recursive option for git-diff... blob | diff | raw | diff to current
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-10-23 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-22 Allow git-merge not to commit. blob | diff | raw | diff to current
2005-10-03 Merge with master.kernel.org:/pub/scm/git/git.git blob | diff | raw | diff to current
2005-10-03 Merge branch 'fixes' blob | diff | raw | diff to current
2005-10-03 Merge with master.kernel.org:/pub/scm/git/git.git blob | diff | raw | diff to current
2005-10-03 [PATCH] Enable and fix support for base less merges. blob | diff | raw | diff to current
2005-10-02 Handle really trivial case inside git-merge. blob | diff | raw | diff to current
2005-09-29 Merge ... www.kernel.org/pub/scm/git/git.git blob | diff | raw | diff to current
2005-09-28 Use git-update-ref in scripts. blob | diff | raw | diff to current
2005-09-28 Fastpath the normal case by not checking that index... blob | diff | raw | diff to current
2005-09-27 Merge ... git+ssh://kernel.org/pub/scm/git/git.git blob | diff | raw | diff to current
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw | diff to current
2005-09-27 Give default merge message after failed automerge. blob | diff | raw | diff to current
next