mergetool: Add prompt to continue after failing to merge a file
[gitweb.git] / builtin-tag.c
2008-11-14 Merge git://git.bogomips.org/git-svn
2008-11-14 Merge branch 'maint'
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge branch 'jn/gitweb-customlinks'
2008-11-13 Merge branch 'gb/gitweb-snapshot-pathinfo'
2008-11-13 Merge branch 'ds/uintmax-config' (early part)
2008-11-13 Merge branch 'jk/maint-commit-v-strip'
2008-11-13 Merge branch 'np/pack-safer'
2008-11-13 Merge branch 'mk/maint-cg-push'
2008-11-13 Merge branch 'bc/maint-keep-pack'
2008-11-13 Merge branch 'mv/remote-rename'
2008-11-13 Merge branch 'jk/deny-push-to-current'
2008-11-13 Merge branch 'dl/xdiff'
2008-11-13 Merge branch 'lt/decorate'
2008-11-13 Merge branch 'jk/diff-convfilter'
2008-11-13 Merge branch 'jk/diff-convfilter-test-fix'
2008-11-13 Merge branch 'st/tag'
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-12 Merge branch 'maint'
2008-11-11 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'cb/maint-update-ref-fix' into maint
2008-11-09 Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Merge branch 'ar/maint-mksnpath' into maint
2008-11-09 Merge branch 'mv/maint-branch-m-symref' into maint
2008-11-09 Merge branch 'ds/autoconf'
2008-11-09 Merge branch 'rs/blame'
2008-11-05 Merge branch 'ar/mksnpath'
2008-11-05 Merge branch 'jc/gitweb-fix-cloud-tag'
2008-11-05 Merge branch 'mv/maint-branch-m-symref'
2008-11-04 tag: Check that options are only allowed in the appropr...
2008-11-04 Merge branch 'maint'
2008-11-03 Merge branch 'maint'
2008-11-03 Merge branch 'sh/rebase-i-p'
2008-11-03 Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 Merge branch 'maint'
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-31 Merge branch 'maint'
2008-10-31 Merge branch 'ar/maint-mksnpath' into ar/mksnpath
2008-10-31 Use git_pathdup instead of xstrdup(git_path(...))
2008-10-27 Merge branch 'ar/maint-mksnpath' into HEAD
2008-10-26 Merge branch 'maint'
2008-10-26 Fix git branch -m for symrefs.
2008-10-22 Merge branch 'js/maint-fetch-update-head'
2008-10-22 Merge branch 'jc/maint-co-track'
2008-10-21 Merge branch 'jc/maint-reset-remove-unmerged-new'
2008-10-21 Merge branch 'maint'
2008-10-21 Merge branch 'maint'
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-19 Merge branch 'sh/maint-rebase3'
2008-10-19 Merge branch 'tr/workflow-doc'
2008-10-19 Merge branch 'mv/clonev'
2008-10-19 Merge branch 'ae/preservemerge'
2008-10-19 Merge branch 'mv/merge-noff'
2008-10-19 Merge branch 'ns/rebase-noverify'
2008-10-19 Merge branch 'maint'
2008-10-18 Merge branch 'maint'
2008-10-18 Merge branch 'pb/commit-where'
2008-10-17 Merge branch 'jk/maint-ls-files-other' into jk/fix...
2008-10-17 Merge branch 'maint'
2008-10-13 Merge branch 'maint'
2008-10-12 Merge branch 'maint'
2008-10-12 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT...
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-19 Merge branch 'tr/rev-list-reverse'
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-30 Merge branch 'jc/post-simplify' (early part) into tr...
2008-08-28 Merge branch 'mv/merge-custom'
2008-08-27 Merge branch 'jc/add-addremove'
2008-08-21 Merge branch 'jc/add-stop-at-symlink'
2008-08-21 Merge branch 'cc/merge-base-many'
2008-08-20 Merge branch 'dp/hash-literally'
2008-08-20 Merge branch 'ph/enable-threaded'
2008-08-20 Merge branch 'jk/pager-swap'
2008-08-20 Merge branch 'rs/imap'
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Merge branch 'maint'
2008-08-13 Merge branch 'maint'
2008-08-13 Merge branch 'jc/post-simplify' into tr/rev-list-docs
2008-08-13 Merge branch 'jc/post-simplify' into tr/filter-branch
2008-08-12 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-11 Merge branch 'maint'
2008-08-09 Merge branch 'maint'
2008-08-07 Merge branch 'lt/config-fsync' into maint
2008-08-07 Merge branch 'jc/reflog-expire' into maint
2008-08-07 Merge branch 'ag/rewrite_one' into maint
2008-08-06 Sync with 1.5.6.5
2008-08-06 Files given on the command line are relative to $cwd
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge branch 'maint'
2008-08-03 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-08-02 Merge branch 'maint'
2008-07-30 Merge git://repo.or.cz/git-gui
next