Update packedGit config option documentation.
[gitweb.git] / git-merge.sh
2006-12-29 Merge branch 'jc/curl'
2006-12-29 Merge branch 'jc/utf8'
2006-12-29 Merge branch 'jc/make'
2006-12-28 Merge branch 'js/shallow'
2006-12-28 Honor pull.{twohead,octopus} in git-merge.
2006-12-28 Use GIT_REFLOG_ACTION environment variable instead.
2006-12-27 Merge branch 'master' into js/shallow
2006-12-27 Merge branch 'jc/fsck-reflog'
2006-12-25 Merge branch 'jc/skip-count'
2006-12-25 Merge branch 'jc/git-add--interactive'
2006-12-24 Merge branch 'sb/merge-friendly'
2006-12-24 Merge branch 'js/rerere'
2006-12-23 Display 'theirs' branch name when possible in merge.
2006-12-22 merge and reset: adjust for "reset --hard" messages
2006-12-22 Merge branch 'maint'
2006-12-21 Merge branch 'ew/svn-pm'
2006-12-20 Merge branch 'maint'
2006-12-18 Merge branch 'jc/blame-boundary'
2006-12-18 Merge branch 'jn/web' (early part)
2006-12-16 merge: give a bit prettier merge message to "merge...
2006-12-14 Merge branch 'maint'
2006-12-14 Merge branch 'jc/diff--cached'
2006-12-13 Merge branch 'jc/read-tree-ignore'
2006-12-13 Merge branch 'ew/rerere'
2006-12-13 Merge branch 'np/addcommit'
2006-12-13 Merge branch 'lh/branch-rename'
2006-12-13 Merge branch 'jc/commit-careful'
2006-12-13 Merge branch 'ap/clone-origin'
2006-12-13 Merge branch 'jc/numstat'
2006-12-13 Merge branch 'rr/cvsexportcommit'
2006-12-13 Merge branch 'ap/branch'
2006-12-13 Merge branch 'js/merge'
2006-12-13 git merge: reword failure message.
2006-12-13 Merge branch 'maint'
2006-12-13 Merge branch 'master' into js/merge
2006-12-13 Merge branch 'maint'
2006-12-11 Merge branch 'maint'
2006-12-07 Merge branch 'maint'
2006-12-06 git-merge: fix "fix confusion between tag and branch...
2006-12-06 git-merge: squelch needless error message.
2006-12-06 Merge
2006-12-06 Merge branch 'maint'
2006-12-06 Loosen "working file will be lost" check in Porcelain-ish
2006-12-05 Merge branch 'maint'
2006-12-03 Merge branch 'maint'
2006-12-03 git-merge: fix confusion between tag and branch
2006-11-29 Merge master.kernel.org:/pub/scm/gitk/gitk
2006-11-29 Merge branch 'maint'
2006-11-29 Merge branch 'jc/globfetch'
2006-11-29 Merge branch 'maint'
2006-11-27 Merge branch 'js/shortlog'
2006-11-27 Merge branch 'jc/push-delete-ref'
2006-11-27 Merge branch 'jc/merge'
2006-11-27 git-merge: do not leak rev-parse output used for checki...
2006-11-27 git-merge: tighten error checking.
2006-11-24 Merge branch 'jc/upload-pack'
2006-11-22 merge: allow merging into a yet-to-be-born branch.
2006-11-22 git-merge: make it usable as the first class UI
2006-11-22 remove merge-recursive-old
2006-11-13 Merge branch 'maint'
2006-11-12 Merge branch 'maint'
2006-11-11 Merge branch 'maint'
2006-11-09 Merge branch 'maint'
2006-11-09 Merge branch 'maint'
2006-11-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08 Merge branch 'maint'
2006-11-08 Merge branch 'jc/pickaxe'
2006-11-07 Merge branch 'maint'
2006-11-05 Merge branch 'maint'
2006-11-04 Merge branch 'maint'
2006-11-03 Merge branch 'maint'
2006-11-01 Merge branch 'maint'
2006-11-01 Merge branch 'jc/refs-and-fetch'
2006-11-01 Merge branch 'lj/refs'
2006-10-31 Merge branch 'maint'
2006-10-27 Merge branch 'maint'
2006-10-26 Merge branch 'jc/combined'
2006-10-26 Merge branch 'jc/combined'
2006-10-25 Merge branch 'maint'
2006-10-25 Merge branch 'aw/cvsimport'
2006-10-25 Merge for-each-ref to sync gitweb fully with 'next'
2006-10-25 Merge branch 'jc/web-blame'
2006-10-25 Merge branch 'maint'
2006-10-24 Merge branch 'master' into jc/web
2006-10-24 Merge branch 'maint'
2006-10-23 Merge branch 'np/pack'
2006-10-23 Merge branch 'maint'
2006-10-22 git-merge: show usage if run without arguments
2006-10-20 Merge branch 'maint'
2006-10-20 Merge branch 'maint'
2006-10-19 Merge branch 'mw/pathinfo'
2006-10-19 Merge branch 'js/diff'
2006-10-19 Merge branch 'jc/send-email'
2006-10-19 Merge branch 'jc/grep'
2006-10-19 Merge early part of branch 'jc/diff-apply-patch'
2006-10-19 Merge branch 'jc/diff-numstat'
2006-10-19 Merge branch 'pb/bisect'
2006-10-19 Merge branch 'mw/send-email'
2006-10-19 Merge branch 'rs/rebase'
2006-10-19 Merge branch 'sb/fetch'
next