doc: generate a list of valid merge tools
[gitweb.git] / Documentation / git-p4.txt
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-17 Sync with 1.7.12.4
2012-10-17 Merge branch 'jk/maint-http-half-auth-push' into maint
2012-10-17 Merge branch 'jc/doc-long-options' into maint
2012-10-17 Merge branch 'jc/maint-t1450-fsck-order-fix' into maint
2012-10-17 Merge branch 'jc/ll-merge-binary-ours' into maint
2012-10-16 Merge branch 'jk/maint-http-half-auth-push'
2012-10-14 Merge branch 'maint'
2012-10-12 Merge branch 'maint'
2012-10-10 Merge branch 'rr/git-uri-doc'
2012-10-10 Merge branch 'bw/cp-a-is-gnuism'
2012-10-10 Merge branch 'nd/doc-ignore'
2012-10-10 Merge branch 'jc/doc-long-options'
2012-10-10 Sync with maint
2012-10-09 Merge branch 'maint'
2012-10-08 Merge branch 'jc/maint-t1450-fsck-order-fix'
2012-10-08 Merge branch 'jc/merge-bases-paint-fix'
2012-10-08 Sync with 1.7.12.3
2012-10-08 Merge branch 'os/commit-submodule-ignore' into maint
2012-10-08 Merge branch 'rt/maint-clone-single' into maint
2012-10-08 Merge branch 'jc/blame-follows-renames' into maint
2012-10-08 Merge branch 'lt/mailinfo-handle-attachment-more-sanely...
2012-10-03 Merge branch 'lt/mailinfo-handle-attachment-more-sanely'
2012-10-02 Merge branch 'maint'
2012-10-02 Merge branch 'rr/maint-submodule-unknown-cmd' into...
2012-10-01 Merge branch 'jk/completion-tests'
2012-10-01 Merge branch 'ep/malloc-check-perturb'
2012-10-01 Merge branch 'da/mergetool-custom'
2012-10-01 Merge branch 'os/commit-submodule-ignore'
2012-10-01 Merge branch 'jc/blame-follows-renames'
2012-10-01 Merge branch 'jk/receive-pack-unpack-error-to-pusher'
2012-10-01 Merge branch 'rt/maint-clone-single'
2012-09-30 Merge git://github.com/git-l10n/git-po
2012-09-30 Sync with 1.7.12.2
2012-09-30 Merge branch 'jc/maint-log-grep-all-match-1' into maint
2012-09-30 Merge branch 'jc/maint-mailinfo-mime-attr' into maint
2012-09-30 Merge branch 'rr/maint-submodule-unknown-cmd'
2012-09-30 Merge branch 'rs/archive-zip-utf8'
2012-09-30 Merge branch 'jk/smart-http-switch'
2012-09-30 Merge branch 'sp/maint-http-enable-gzip'
2012-09-30 Merge branch 'sp/maint-http-info-refs-no-retry'
2012-09-30 Merge branch 'aw/rebase-i-edit-todo'
2012-09-30 Merge branch 'js/rebase-exec-command-not-found'
2012-09-30 Merge branch 'rr/test-use-shell-path-not-shell'
2012-09-25 Merge branch 'rr/test-make-sure-we-have-git'
2012-09-25 Merge branch 'js/hp-nonstop'
2012-09-25 Merge branch 'js/poll-emu'
2012-09-25 Merge branch 'ep/malloc-check-perturb'
2012-09-25 Merge branch 'aj/xfuncname-ada'
2012-09-25 Merge branch 'jc/maint-mailinfo-mime-attr'
2012-09-25 Merge branch 'po/maint-docs'
2012-09-25 Merge branch 'db/doc-custom-xmlto'
2012-09-25 Merge branch 'maint'
2012-09-24 Sync with maint
2012-09-24 Merge branch 'jc/maint-blame-no-such-path' into maint
2012-09-24 Merge branch 'dj/fetch-all-tags' into maint
2012-09-21 Merge branch 'mh/fetch-filter-refs'
2012-09-21 Merge branch 'jc/maint-log-grep-all-match-1'
2012-09-20 Merge branch 'maint'
2012-09-20 Merge branch 'dg/run-command-child-cleanup' into maint
2012-09-20 Merge branch 'sn/ls-remote-get-url-doc' into maint
2012-09-20 Merge branch 'nd/log-n-doc' into maint
2012-09-18 Merge branch 'jc/maint-log-grep-all-match'
2012-09-18 Merge branch 'jc/make-static'
2012-09-18 Merge branch 'pw/p4-submit-conflicts'
2012-09-18 Merge branch 'nd/fetch-status-alignment'
2012-09-18 Merge branch 'er/doc-fast-import-done' into maint
2012-09-17 Merge branch 'jc/maint-blame-no-such-path'
2012-09-17 git-p4: add submit --conflict option and config varaiable
2012-09-17 git p4: add submit --prepare-p4-only option
2012-09-17 git p4: add submit --dry-run option
2012-09-17 git p4: accept -v for --verbose
2012-09-15 Merge branch 'jc/ll-merge-binary-ours'
2012-09-15 Merge branch 'dg/run-command-child-cleanup'
2012-09-15 Merge branch 'sb/send-email-reconfirm-fix' into maint
2012-09-15 Merge branch 'jc/send-email-reconfirm' into maint
2012-09-15 Merge branch 'mz/cherry-pick-cmdline-order' into maint
2012-09-15 Sync with 1.7.11.7
2012-09-15 Merge branch 'rj/test-regex' into maint-1.7.11
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-15 Merge branch 'jc/maint-checkout-fileglob-doc' into...
2012-09-14 Merge branch 'mh/abspath'
2012-09-14 Merge branch 'dj/fetch-all-tags'
2012-09-14 Merge branch 'sn/ls-remote-get-url-doc'
2012-09-12 Merge branch 'jc/maint-checkout-fileglob-doc'
2012-09-12 Merge branch 'sb/send-email-reconfirm-fix'
2012-09-12 Merge branch 'nd/log-n-doc'
2012-09-12 Merge branch 'maint-1.7.11' into maint
2012-09-12 Merge branch 'jc/apply-binary-p0' into maint-1.7.11
2012-09-12 Merge branch 'jc/maint-doc-checkout-b-always-takes...
2012-09-12 Merge branch 'jk/maint-http-half-auth-push' into maint...
2012-09-12 Merge branch 'kk/maint-for-each-ref-multi-sort' into...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-09-11 Merge branch 'rj/test-regex'
2012-09-11 Merge branch 'jk/argv-array'
2012-09-11 Merge branch 'jc/merge-bases'
2012-09-11 Merge branch 'jc/maint-ident-missing-human-name'
2012-09-11 Sync with 1.7.11.6
2012-09-11 Merge branch 'ph/stash-rerere' into maint-1.7.11
next