Aggressive three-way merge: fix D/F case
[gitweb.git] / git-submodule.sh
2009-10-04 Merge branch 'jc/maint-1.6.4-show-branch-default' into...
2009-09-29 typo fix: Directory `...' exist, ...: s/exist/exists/
2009-09-22 git submodule add: make the <path> parameter optional
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-20 Merge branch 'maint'
2009-09-16 Merge 1.6.4.4 in
2009-09-16 Merge branch 'jc/maint-unpack-objects-strict' into...
2009-09-16 Merge branch 'tf/diff-whitespace-incomplete-line' into...
2009-09-16 Merge branch 'jk/maint-1.6.3-checkout-unborn' into...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-15 Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
2009-09-14 Merge branch 'maint'
2009-09-13 Merge branch 'db/vcs-helper'
2009-09-13 Merge branch 'maint'
2009-09-13 Merge branch 'cb/maint-1.6.3-grep-relative-up' into...
2009-09-07 Merge branch 'maint'
2009-09-07 Merge branch 'jc/mailinfo-scissors'
2009-09-07 Merge branch 'jk/clone-b'
2009-09-07 Merge branch 'jc/upload-pack-hook'
2009-09-07 Merge branch 'tr/reset-checkout-patch'
2009-09-07 Merge branch 'np/maint-1.6.3-deepen'
2009-09-06 Merge branch 'maint'
2009-09-03 Merge branch 'maint'
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-03 Merge branch 'maint'
2009-09-03 Merge branch 'maint-1.6.3' into maint
2009-09-03 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-09-01 Merge branch 'lt/approxidate'
2009-09-01 Merge branch 'mr/gitweb-snapshot'
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29 Sync with 1.6.4.2
2009-08-29 Merge branch 'mm/reset-report'
2009-08-29 Merge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-29 Merge branch 'np/maint-1.6.3-deepen'
2009-08-29 Merge branch 'jc/shortstatus'
2009-08-29 Merge branch 'maint'
2009-08-28 Merge branch 'maint'
2009-08-28 Merge branch 'maint-1.6.3' into maint
2009-08-28 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-28 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-28 Merge branch 'lt/block-sha1'
2009-08-27 Merge branch 'as/maint-graph-interesting-fix'
2009-08-27 Merge branch 'jh/submodule-foreach'
2009-08-27 Merge branch 'jc/maint-unpack-objects-strict'
2009-08-27 Merge branch 'wl/insta-mongoose'
2009-08-27 Merge branch 'nd/sparse' (early part)
2009-08-26 Merge branch 'maint'
2009-08-26 Merge branch 'maint-1.6.3' into maint
2009-08-25 Merge branch 'aj/fix-read-tree-from-scratch'
2009-08-25 Merge branch 'jc/maint-checkout-index-to-prefix'
2009-08-25 Merge branch 'jl/submodule-summary-diff-files'
2009-08-22 Merge branch 'cc/replace'
2009-08-21 Merge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-19 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-19 git submodule status: Add --recursive to recurse into...
2009-08-19 git submodule update: Introduce --recursive to update...
2009-08-19 git submodule foreach: Add --recursive to recurse into...
2009-08-19 git submodule: Cleanup usage string and add option...
2009-08-18 git submodule foreach: Provide access to submodule...
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-15 git submodule summary: add --files option
2009-08-12 Merge branch 'maint-1.6.3' into maint
2009-08-11 Merge branch 'maint-1.6.3' into maint
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-08 Merge branch 'maint-1.6.3' into maint
2009-08-08 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-08 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-05 Merge branch 'sb/read-tree'
2009-08-05 Merge branch 'ne/futz-upload-pack'
2009-08-05 Merge branch 'maint-1.6.3' into maint
2009-07-29 Merge branch 'hv/cvsps-tests'
2009-07-29 Sync with 1.6.3.4
2009-07-26 Merge branch 'gp/maint-rebase-p-onto'
2009-07-26 Merge branch 'en/fast-export'
2009-07-25 Merge branch 'maint'
2009-07-25 Merge branch 'maint'
2009-07-25 Merge branch 'js/maint-graft-unhide-true-parents'
2009-07-25 Merge branch 'av/maint-config-reader'
2009-07-25 Merge branch 'jk/maint-send-email-alias-loop'
2009-07-24 Merge branch 'maint'
2009-07-23 Merge branch 'maint'
2009-07-18 Merge branch 'maint'
2009-07-11 Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'
2009-07-09 Merge branch 'ld/push-porcelain-output-format'
2009-07-09 Merge branch 'gb/gitweb-avatar'
2009-07-09 Merge branch 'ml/http'
2009-07-09 Merge branch 'rs/grep-p'
2009-07-08 Merge branch 'maint'
2009-07-06 Merge branch 'tr/die_errno'
2009-07-06 Merge branch 'cb/maint-fetch-refspec-wo-dst'
2009-07-06 Merge branch 'sb/show-ref-parse-options'
2009-07-06 Merge branch 'gb/am-foreign'
2009-07-06 Merge branch 'jk/use-our-regexp'
2009-07-06 Merge branch 'uk/rev-parse-parse-opt'
next