merge-recursive: Avoid doubly merging rename/add conflict contents
[gitweb.git] / test-parse-options.c
2009-05-29 Merge branch 'rs/maint-grep-word-regexp-fix'
2009-05-29 Merge branch 'maint'
2009-05-26 Merge branch 'maint'
2009-05-25 parse-opts: add OPT_FILENAME and transition builtins
2009-05-25 parse-opts: prepare for OPT_FILENAME
2009-05-25 Merge branch 'jc/mktree' into sb/opt-filename
2009-05-25 Merge branch 'sb/format-patch-parseopt' into sb/opt...
2009-05-25 Merge branch 'sb/show-branch-parse-options' into sb...
2009-05-25 Merge branch 'master' into sb/opt-filename
2009-05-24 Merge branch 'maint'
2009-05-23 Merge branch 'jn/gitweb-cleanup'
2009-05-23 Merge branch 'mg/track'
2009-05-23 Merge branch 'fc/decorate-tag'
2009-05-23 Merge branch 'tp/send-email-from-config'
2009-05-23 Merge branch 'js/maint-no-ln-across-libexec-and-bin'
2009-05-23 Merge branch 'da/mergetool-lib'
2009-05-23 Merge branch 'cc/bisect' (early part)
2009-05-23 Merge branch 'lt/maint-diff-reduce-lstat'
2009-05-23 Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'
2009-05-23 Merge branch 'do/maint-merge-recursive-fix'
2009-05-23 Merge branch 'rr/forbid-bs-in-ref'
2009-05-23 Merge branch 'hv/sample-update'
2009-05-23 Merge branch 'jk/maint-1.6.0-trace-argv'
2009-05-23 Merge branch 'jk/no-no-no-empty-directory'
2009-05-23 Merge branch 'rs/grep-parseopt'
2009-05-09 parseopt: add PARSE_OPT_NODASH
2009-05-09 parseopt: add OPT_NUMBER_CALLBACK
2009-05-09 parseopt: add OPT_NEGBIT
2009-05-02 Merge git://repo.or.cz/git-gui
2009-05-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-02-11 Merge branch 'maint-1.5.5' into maint-1.5.6
2009-02-11 Merge branch 'maint-1.5.4' into maint-1.5.5
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Merge branch 'ap/maint-apply-modefix'
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-17 GIT 1.5.6.6 v1.5.6.6
2008-12-17 GIT 1.5.5.6 v1.5.5.6
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge git://repo.or.cz/git-gui
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-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
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-09-03 Merge branch 'tr/filter-branch'
2008-08-30 Merge branch 'sp/missing-thin-base' into maint
2008-08-28 Merge branch 'mv/merge-custom'
2008-08-27 Merge branch 'am/cherry-pick-rerere'
2008-08-27 Merge branch 'jc/add-addremove'
2008-08-21 Merge branch 'jc/add-stop-at-symlink'
2008-08-21 Merge branch 'kh/diff-tree'
2008-08-21 Merge branch 'cc/merge-base-many'
2008-08-21 Merge branch 'js/parallel-test'
2008-08-20 Merge branch 'dp/hash-literally'
2008-08-20 Merge branch 'js/checkout-dwim-local'
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 branch 'ak/p4'
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Merge branch 'maint'
2008-08-14 test-parse-options: use appropriate cast in length_callback
2008-08-13 Merge branch 'maint'
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-06 Sync with 1.5.6.5
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 'rs/archive-parse-options'
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 Fix test-parse-options "integer" test
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-09 Merge branch 'jc/reflog-expire'
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD
2008-07-08 Merge branch 'lt/racy-empty' into maint
2008-07-07 Merge branch 'jc/rerere'
2008-07-07 Merge branch 'dr/ceiling'
next