git-p4: add submit --conflict option and config varaiable
[gitweb.git] / compat / snprintf.c
2011-11-10 Merge "Move 'builtin-*' into a 'builtin/' subdirectory"
2011-11-10 Merge 'build-in git-mktree'
2011-11-09 Merge branch 'jc/maint-remove-renamed-ref' into maint
2011-10-21 Merge branch 'jc/maint-remove-renamed-ref'
2011-10-21 Merge branch 'jc/apply-blank-at-eof-fix' into maint
2011-10-19 Merge branch 'cb/httpd-test-fix-port'
2011-10-16 Merge git://repo.or.cz/git-gui
2011-10-14 Merge branch 'jc/apply-blank-at-eof-fix'
2011-10-05 Merge branch 'gb/am-hg-patch'
2011-09-23 Merge branch 'gb/maint-am-patch-format-error-message...
2011-09-02 Merge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02 Merge branch 'gb/maint-am-patch-format-error-message'
2011-08-16 Merge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16 Merge branch 'jn/mime-type-with-params' into maint
2011-07-22 Merge branch 'js/maint-add-path-stat-pwd'
2011-07-19 Merge branch 'jn/mime-type-with-params'
2011-07-06 Merge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-07-06 Merge commit 'v1.6.0' into jc/checkout-reflog-fix
2011-06-06 Merge branch 'jn/mime-type-with-params'
2011-06-06 Merge branch 'jk/diff-not-so-quick'
2011-06-06 Merge branch 'bc/maint-status-z-to-use-porcelain'
2011-05-31 Merge remote-tracking branch 'ko/maint' into jc/diff...
2011-04-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2011-04-03 Merge branch 'jc/maint-rev-list-culled-boundary' into...
2011-04-01 Merge branch 'jc/maint-diff-q-filter' into maint
2011-03-26 Merge git-gui 0.14.0
2011-03-23 Merge branch 'jc/maint-diff-q-filter'
2011-03-23 Merge branch 'jc/maint-rev-list-culled-boundary'
2010-12-15 Git 1.6.5.9 v1.6.5.9
2010-12-14 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-09-18 Merge branch 'js/ls-files-x-doc'
2010-09-15 Merge git://repo.or.cz/git-gui
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-07-26 Merge branch 'maint-1.6.4' into maint-1.6.5
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
2010-07-09 Merge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07 Merge branch 'maint-1.6.4' into maint
2010-06-16 Merge branch 'jc/am-3-show-corrupted-patch' into maint
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-07 Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-03 Merge branch 'jc/maint-fix-test-perm' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
2010-02-21 Merge branch 'jc/maint-fix-test-perm'
2010-02-19 Merge branch 'jk/maint-rmdir-fix' into maint
2010-02-10 Merge branch 'jh/maint-config-file-prefix' into maint
2010-02-10 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
2010-02-09 Merge branch 'jc/maint-push-doc-status' into maint
2010-02-08 Merge branch 'jc/maint-imap-config-parse' into maint
2010-02-08 Merge branch 'jc/maint-doc-git-add-example' into maint
2010-02-07 Merge git://repo.or.cz/git-gui v1.7.0-rc2
2010-02-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-31 Merge commit 'b319ef7' into jc/maint-fix-test-perm
2010-01-29 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-01-27 Merge branch 'jh/maint-config-file-prefix'
2010-01-24 Merge branch 'maint' of git://git.spearce.org/git-gui...
2010-01-19 Merge branch 'maint-1.6.4' into maint-1.6.5
2010-01-19 Merge branch 'maint-1.6.3' into maint-1.6.4
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-13 Merge branch 'nd/sparse'
2010-01-12 Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
2010-01-10 Merge branch 'maint-1.6.2' into maint
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint-1.6.1' into maint
2009-12-28 Merge branch 'jk/1.7.0-status'
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-26 Merge branch 'jc/1.7.0-diff-whitespace-only-status'
2009-12-26 Merge branch 'jc/1.7.0-push-safety'
2009-12-26 Merge branch 'jc/1.7.0-send-email-no-thread-default'
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-12-03 Merge branch 'np/maint-sideband-favor-status' into...
2009-12-01 Merge branch 'jn/gitweb-blame'
2009-11-30 Merge branch 'jc/mailinfo-remove-brackets'
2009-11-30 Merge branch 'jc/maint-am-keep'
2009-11-21 Merge branch 'jc/fix-tree-walk' (early part)
2009-11-21 Merge branch 'jp/fetch-cull-many-refs'
2009-11-18 Merge branch 'np/maint-sideband-favor-status'
next