projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fixup: Second argument may be any arbitrary string
[git] / ll-merge.c
2010-04-04  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'mb/rebase-i-no-ff' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'sp/maint-http-backend-die-triggers-die... blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'rr/imap-send-unconfuse-from-line' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'mg/use-default-abbrev-length-in-rev-list' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'mg/maint-send-email-lazy-editor' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'rb/maint-python-path' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'jn/merge-diff3-label' blob | commitdiff | raw
2010-04-03  Junio C HamanoMerge branch 'bw/template-tool-buildconfig' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'mg/mailmap-update' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'bc/t5505-fix' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'gh/maint-stash-show-error-message' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'rs/threaded-grep-context' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'bc/maint-daemon-sans-ss-family' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'bc/acl-test' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'ja/send-email-ehlo' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'do/rebase-i-arbitrary' blob | commitdiff | raw | diff to current
2010-04-03  Junio C HamanoMerge branch 'ak/everyday-git' blob | commitdiff | raw | diff to current
2010-03-31  Junio C HamanoSync with 1.7.0.4 blob | commitdiff | raw | diff to current
2010-03-31  Junio C HamanoMerge branch 'jc/maint-refs-dangling' into maint blob | commitdiff | raw | diff to current
2010-03-30  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-29  Junio C HamanoMerge branch 'cc/cherry-pick-ff' blob | commitdiff | raw | diff to current
2010-03-29  Junio C HamanoMerge branch 'sb/notes-parse-opt' blob | commitdiff | raw | diff to current
2010-03-29  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-29  Junio C HamanoMerge branch 'cp/add-u-pathspec' into maint blob | commitdiff | raw | diff to current
2010-03-29  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jh/maint-submodule-status-in-void' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'tr/notes-display' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jl/submodule-diff-dirtiness' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'pb/log-first-parent-p-m' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jc/maint-refs-dangling' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jc/color-attrs' into maint blob | commitdiff | raw | diff to current
2010-03-24  Junio C HamanoMerge branch 'jk/maint-add-ignored-dir' into maint blob | commitdiff | raw | diff to current
2010-03-22  Junio C HamanoSync with Git 1.7.0.3 blob | commitdiff | raw | diff to current
2010-03-22  Junio C HamanoMerge branch 'maint-1.6.6' into maint blob | commitdiff | raw | diff to current
2010-03-21  Jonathan Niederll_merge(): add ancestor label parameter for diff3... blob | commitdiff | raw
2010-03-21  Jonathan Niederxdl_merge(): move file1 and file2 labels to xmparam... blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'jk/maint-add-ignored-dir' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'ml/color-grep' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'jc/color-attrs' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'cc/reset-keep' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'fl/askpass' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'bg/apply-fix-blank-at-eof' blob | commitdiff | raw | diff to current
2010-03-20  Junio C HamanoMerge branch 'bw/union-merge-refactor' blob | commitdiff | raw | diff to current
2010-03-10  Junio C HamanoMerge branch 'cp/add-u-pathspec' blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat' into maint blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'jk/maint-push-tracking-wo-remote' into... blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'jk/maint-add--interactive-delete' into... blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'jc/grep-author-all-match-implicit' into... blob | commitdiff | raw | diff to current
2010-03-08  Junio C HamanoMerge branch 'maint-1.6.6' into maint blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jc/maint-fix-test-perm' into maint-1.6.6 blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint... blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jk/maint-rmdir-fix' into maint-1.6.6 blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint... blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'fn/maint-mkdtemp-compat' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jk/maint-push-tracking-wo-remote' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'nd/root-git' blob | commitdiff | raw | diff to current
2010-03-07  Junio C HamanoMerge branch 'jk/maint-add--interactive-delete' blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' into maint blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'rs/optim-text-wrap' into maint blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' into maint blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'cc/maint-bisect-paths' into maint blob | commitdiff | raw | diff to current
2010-03-05  Junio C HamanoMerge branch 'maint-1.6.6' into maint blob | commitdiff | raw | diff to current
2010-03-03  Junio C HamanoMerge branch 'hm/maint-imap-send-crlf' into maint blob | commitdiff | raw | diff to current
2010-03-03  Junio C HamanoMerge branch 'sp/maint-push-sideband' into maint blob | commitdiff | raw | diff to current
2010-03-03  Junio C HamanoMerge branch 'jc/maint-fix-test-perm' into maint blob | commitdiff | raw | diff to current
2010-03-02  Junio C HamanoMerge branch 'tr/maint-cherry-pick-list' blob | commitdiff | raw | diff to current
2010-03-02  Junio C HamanoMerge branch 'rs/optim-text-wrap' blob | commitdiff | raw | diff to current
2010-03-02  Junio C HamanoMerge branch 'gf/maint-sh-setup-nongit-ok' blob | commitdiff | raw | diff to current
2010-03-02  Junio C HamanoMerge branch 'jc/grep-author-all-match-implicit' blob | commitdiff | raw | diff to current
2010-03-02  Bert Wesargrefactor merge flags into xmparam_t blob | commitdiff | raw | diff to current
2010-03-02  Bert Wesargmake union merge an xdl merge favor blob | commitdiff | raw | diff to current
2010-03-01  Junio C HamanoMerge branch 'cc/maint-bisect-paths' blob | commitdiff | raw | diff to current
2010-02-26  Junio C HamanoMerge branch 'maint-1.6.6' into maint blob | commitdiff | raw | diff to current
2010-02-24  Junio C HamanoMerge branch 'ml/maint-grep-doc' into maint blob | commitdiff | raw | diff to current
2010-02-23  Junio C HamanoMerge branch 'il/rev-glob' blob | commitdiff | raw | diff to current
2010-02-21  Junio C HamanoMerge branch 'ml/maint-grep-doc' blob | commitdiff | raw | diff to current
2010-02-21  Junio C HamanoMerge branch 'hm/maint-imap-send-crlf' blob | commitdiff | raw | diff to current
2010-02-21  Junio C HamanoMerge branch 'jc/maint-fix-test-perm' blob | commitdiff | raw | diff to current
2010-02-19  Junio C HamanoMerge branch 'jk/maint-rmdir-fix' into maint blob | commitdiff | raw | diff to current
2010-02-16  Junio C HamanoMerge branch 'maint-1.6.6' into maint blob | commitdiff | raw | diff to current
2010-02-15  Junio C HamanoMerge branch 'maint-1.6.6' into maint blob | commitdiff | raw | diff to current
2010-02-12  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-02-12  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-02-10  Junio C HamanoSync with 1.6.6.2 blob | commitdiff | raw | diff to current
2010-02-10  Junio C HamanoMerge branch 'jh/maint-config-file-prefix' into maint blob | commitdiff | raw | diff to current
2010-02-10  Junio C HamanoMerge branch 'jc/maint-1.6.1-checkout-m-custom-merge... blob | commitdiff | raw | diff to current
2010-02-10  Junio C HamanoMerge branch 'sp/maint-push-sideband' into sp/push... blob | commitdiff | raw | diff to current
2010-02-09  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-02-09  Junio C HamanoMerge branch 'jc/maint-push-doc-status' into maint blob | commitdiff | raw | diff to current
2010-02-08  Junio C HamanoMerge branch 'jc/maint-imap-config-parse' into maint blob | commitdiff | raw | diff to current
2010-02-08  Junio C HamanoMerge branch 'jc/maint-doc-git-add-example' into maint blob | commitdiff | raw | diff to current
2010-02-07  Junio C HamanoMerge git://repo.or.cz/git-gui v1.7.0-rc2 blob | commitdiff | raw | diff to current
2010-02-07  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-02-06  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2010-02-06  Junio C HamanoMerge branch 'sp/maint-push-sideband' into sp/push... blob | commitdiff | raw | diff to current
2010-02-06  Junio C HamanoMerge branch 'maint' blob | commitdiff | raw | diff to current
2010-02-01  Junio C HamanoMerge branch 'sp/maint-fast-import-large-blob' into... blob | commitdiff | raw | diff to current
2010-01-31  Junio C HamanoMerge commit 'b319ef7' into jc/maint-fix-test-perm blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.