Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
[gitweb.git]
/
git-merge.sh
2007-03-25
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-24
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-22
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2007-03-22
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-22
git-merge: Put FETCH_HEAD data in merge commit message
blob
|
diff
|
raw
2007-03-20
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-03-19
Merge branch 'fl/cvsserver'
blob
|
diff
|
raw
|
diff to current
2007-03-19
Merge branch 'sp/run-command'
blob
|
diff
|
raw
|
diff to current
2007-03-18
Merge branch 'ar/diff'
blob
|
diff
|
raw
|
diff to current
2007-03-17
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-03-16
git-merge: finish when git-read-tree fails
blob
|
diff
|
raw
|
diff to current
2007-03-14
Merge branch 'jc/repack'
blob
|
diff
|
raw
|
diff to current
2007-03-14
Merge branch 'jc/fetch'
blob
|
diff
|
raw
|
diff to current
2007-03-14
Merge branch 'jb/per-user-exclude'
blob
|
diff
|
raw
|
diff to current
2007-03-14
Merge branch 'pb/branch-track'
blob
|
diff
|
raw
|
diff to current
2007-03-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-03-12
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-03-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-03-12
git-merge: warn when -m provided on a fast forward
blob
|
diff
|
raw
|
diff to current
2007-03-06
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-03-05
Merge branch 'js/fetch-progress' (early part)
blob
|
diff
|
raw
|
diff to current
2007-03-05
Merge branch 'js/symlink'
blob
|
diff
|
raw
|
diff to current
2007-03-04
Merge branch 'js/diff-ni' (early part)
blob
|
diff
|
raw
|
diff to current
2007-03-04
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-03-03
git-merge: fail correctly when we cannot fast forward.
blob
|
diff
|
raw
|
diff to current
2007-03-02
Merge branch 'js/commit-format'
blob
|
diff
|
raw
|
diff to current
2007-02-28
Merge branch 'js/bundle'
blob
|
diff
|
raw
|
diff to current
2007-02-28
Merge branch 'mc/sendmail'
blob
|
diff
|
raw
|
diff to current
2007-02-27
Merge branch 'np/types' into jc/fetch
blob
|
diff
|
raw
|
diff to current
2007-02-26
Merge branch 'jc/merge-symlink' into maint
blob
|
diff
|
raw
|
diff to current
2007-02-25
Merge git://repo.or.cz/git-gui into maint
blob
|
diff
|
raw
|
diff to current
2007-02-24
Evil Merge branch 'jc/status' (early part) into js...
blob
|
diff
|
raw
|
diff to current
2007-02-24
Merge branch 'js/apply'
blob
|
diff
|
raw
|
diff to current
2007-02-24
Merge branch 'js/no-limit-boundary'
blob
|
diff
|
raw
|
diff to current
2007-02-24
Merge branch 'js/etc-config'
blob
|
diff
|
raw
|
diff to current
2007-02-23
Merge branches 'lt/crlf' and 'jc/apply-config'
blob
|
diff
|
raw
|
diff to current
2007-02-21
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-02-21
Merge branch 'fk/autoconf'
blob
|
diff
|
raw
|
diff to current
2007-02-21
Merge branch 'js/name-rev-fix'
blob
|
diff
|
raw
|
diff to current
2007-02-20
Merge branch 'js/diff-color-check'
blob
|
diff
|
raw
|
diff to current
2007-02-20
Merge branch 'jc/fetch-notags'
blob
|
diff
|
raw
|
diff to current
2007-02-19
Merge branch 'ap/cvsserver'
blob
|
diff
|
raw
|
diff to current
2007-02-18
Merge git://git./pub/scm/gitk/gitk into maint
blob
|
diff
|
raw
|
diff to current
2007-02-16
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-02-16
git-merge: minor fix for no_trivial_merge_strategies.
blob
|
diff
|
raw
|
diff to current
2007-02-14
Merge branch 'js/reverse'
blob
|
diff
|
raw
|
diff to current
2007-02-14
Merge branch 'jc/diff-apply-patch'
blob
|
diff
|
raw
|
diff to current
2007-02-14
Merge branch 'jc/merge-base' (early part)
blob
|
diff
|
raw
|
diff to current
2007-02-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-02-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-02-12
Merge git-gui
blob
|
diff
|
raw
|
diff to current
2007-02-04
Merge branch 'master' into np/dreflog
blob
|
diff
|
raw
|
diff to current
2007-01-31
Merge branch 'master' of git://linux-nfs.org/~bfields/git
blob
|
diff
|
raw
|
diff to current
2007-01-30
Merge branch 'master' into sp/gfi
blob
|
diff
|
raw
|
diff to current
2007-01-29
[PATCH] Rename git-repo-config to git-config.
blob
|
diff
|
raw
|
diff to current
2007-01-26
git-merge: leave sensible reflog message when used...
blob
|
diff
|
raw
|
diff to current
2007-01-15
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-01-15
Merge branch 'master' of git://git./git/git
blob
|
diff
|
raw
|
diff to current
2007-01-14
Merge branch 'jc/int'
blob
|
diff
|
raw
|
diff to current
2007-01-14
Merge branch 'sp/merge' (early part)
blob
|
diff
|
raw
|
diff to current
2007-01-14
Merge branch 'jc/subdir'
blob
|
diff
|
raw
|
diff to current
2007-01-14
Merge branch 'master' into sp/fast-import
blob
|
diff
|
raw
|
diff to current
2007-01-13
Allow whole-tree operations to be started from a subdir...
blob
|
diff
|
raw
|
diff to current
2007-01-12
Merge branch 'jc/bare'
blob
|
diff
|
raw
|
diff to current
2007-01-10
Improve merge performance by avoiding in-index merges.
blob
|
diff
|
raw
|
diff to current
2007-01-10
Disallow working directory commands in a bare repository.
blob
|
diff
|
raw
|
diff to current
2007-01-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-01-07
Merge branch 'sp/mmap'
blob
|
diff
|
raw
|
diff to current
2007-01-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-01-01
Merge branch 'sp/merge' (early part)
blob
|
diff
|
raw
|
diff to current
2007-01-01
fail pull/merge early in the middle of conflicted merge
blob
|
diff
|
raw
|
diff to current
2006-12-29
Merge branch 'jc/curl'
blob
|
diff
|
raw
|
diff to current
2006-12-29
Merge branch 'jc/utf8'
blob
|
diff
|
raw
|
diff to current
2006-12-29
Merge branch 'jc/make'
blob
|
diff
|
raw
|
diff to current
2006-12-28
Merge branch 'js/shallow'
blob
|
diff
|
raw
|
diff to current
2006-12-28
Honor pull.{twohead,octopus} in git-merge.
blob
|
diff
|
raw
|
diff to current
2006-12-28
Use GIT_REFLOG_ACTION environment variable instead.
blob
|
diff
|
raw
|
diff to current
2006-12-27
Merge branch 'master' into js/shallow
blob
|
diff
|
raw
|
diff to current
2006-12-27
Merge branch 'jc/fsck-reflog'
blob
|
diff
|
raw
|
diff to current
2006-12-25
Merge branch 'jc/skip-count'
blob
|
diff
|
raw
|
diff to current
2006-12-25
Merge branch 'jc/git-add--interactive'
blob
|
diff
|
raw
|
diff to current
2006-12-24
Merge branch 'sb/merge-friendly'
blob
|
diff
|
raw
|
diff to current
2006-12-24
Merge branch 'js/rerere'
blob
|
diff
|
raw
|
diff to current
2006-12-23
Display 'theirs' branch name when possible in merge.
blob
|
diff
|
raw
|
diff to current
2006-12-22
merge and reset: adjust for "reset --hard" messages
blob
|
diff
|
raw
|
diff to current
2006-12-22
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-21
Merge branch 'ew/svn-pm'
blob
|
diff
|
raw
|
diff to current
2006-12-20
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-18
Merge branch 'jc/blame-boundary'
blob
|
diff
|
raw
|
diff to current
2006-12-18
Merge branch 'jn/web' (early part)
blob
|
diff
|
raw
|
diff to current
2006-12-16
merge: give a bit prettier merge message to "merge...
blob
|
diff
|
raw
|
diff to current
2006-12-14
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-14
Merge branch 'jc/diff--cached'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'jc/read-tree-ignore'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'ew/rerere'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'np/addcommit'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'lh/branch-rename'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'jc/commit-careful'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'ap/clone-origin'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'jc/numstat'
blob
|
diff
|
raw
|
diff to current
next