Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Don't crash fast-import if the marks cannot be exported.
[gitweb.git]
/
git-merge.sh
2007-01-30
Merge branch 'master' into sp/gfi
blob
|
diff
|
raw
2007-01-29
[PATCH] Rename git-repo-config to git-config.
blob
|
diff
|
raw
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-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
2006-12-13
Merge branch 'rr/cvsexportcommit'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'ap/branch'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'js/merge'
blob
|
diff
|
raw
|
diff to current
2006-12-13
git merge: reword failure message.
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'master' into js/merge
blob
|
diff
|
raw
|
diff to current
2006-12-13
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-11
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-07
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-06
git-merge: fix "fix confusion between tag and branch...
blob
|
diff
|
raw
|
diff to current
2006-12-06
git-merge: squelch needless error message.
blob
|
diff
|
raw
|
diff to current
2006-12-06
Merge
blob
|
diff
|
raw
|
diff to current
2006-12-06
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-06
Loosen "working file will be lost" check in Porcelain-ish
blob
|
diff
|
raw
|
diff to current
2006-12-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-03
git-merge: fix confusion between tag and branch
blob
|
diff
|
raw
|
diff to current
2006-11-29
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2006-11-29
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-29
Merge branch 'jc/globfetch'
blob
|
diff
|
raw
|
diff to current
2006-11-29
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-27
Merge branch 'js/shortlog'
blob
|
diff
|
raw
|
diff to current
2006-11-27
Merge branch 'jc/push-delete-ref'
blob
|
diff
|
raw
|
diff to current
2006-11-27
Merge branch 'jc/merge'
blob
|
diff
|
raw
|
diff to current
2006-11-27
git-merge: do not leak rev-parse output used for checki...
blob
|
diff
|
raw
|
diff to current
2006-11-27
git-merge: tighten error checking.
blob
|
diff
|
raw
|
diff to current
2006-11-24
Merge branch 'jc/upload-pack'
blob
|
diff
|
raw
|
diff to current
2006-11-22
merge: allow merging into a yet-to-be-born branch.
blob
|
diff
|
raw
|
diff to current
2006-11-22
git-merge: make it usable as the first class UI
blob
|
diff
|
raw
|
diff to current
2006-11-22
remove merge-recursive-old
blob
|
diff
|
raw
|
diff to current
2006-11-13
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-11
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-08
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2006-11-08
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-08
Merge branch 'jc/pickaxe'
blob
|
diff
|
raw
|
diff to current
2006-11-07
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-04
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-01
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-11-01
Merge branch 'jc/refs-and-fetch'
blob
|
diff
|
raw
|
diff to current
2006-11-01
Merge branch 'lj/refs'
blob
|
diff
|
raw
|
diff to current
2006-10-31
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-10-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-10-26
Merge branch 'jc/combined'
blob
|
diff
|
raw
|
diff to current
2006-10-26
Merge branch 'jc/combined'
blob
|
diff
|
raw
|
diff to current
2006-10-25
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-10-25
Merge branch 'aw/cvsimport'
blob
|
diff
|
raw
|
diff to current
2006-10-25
Merge for-each-ref to sync gitweb fully with 'next'
blob
|
diff
|
raw
|
diff to current
2006-10-25
Merge branch 'jc/web-blame'
blob
|
diff
|
raw
|
diff to current
2006-10-25
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
next