Improve language in git-merge.txt and related docs
[git/git.git] / Documentation / merge-options.txt
2008-12-10 Ralf WildenhuesImprove language in git-merge.txt and related docs
2008-12-07 Junio C HamanoMerge branch 'maint'
2008-12-03 Junio C HamanoMerge branch 'maint'
2008-12-03 Junio C HamanoMerge branch 'maint'
2008-12-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-02 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-01 Junio C HamanoMerge branch 'maint'
2008-11-29 Junio C HamanoMerge branch 'nd/narrow' (early part) into jc/add-i-t-a
2008-11-28 Junio C HamanoMerge branch 'cc/bisect-skip'
2008-11-28 Junio C HamanoMerge branch 'js/mingw-rename-fix'
2008-11-28 Junio C HamanoMerge branch 'st/levenshtein'
2008-11-28 Junio C HamanoMerge branch 'cr/remote-update-v'
2008-11-28 Junio C HamanoMerge branch 'rs/strbuf-expand'
2008-11-28 Junio C HamanoMerge branch 'mv/clone-strbuf'
2008-11-28 Junio C HamanoMerge branch 'lt/preload-lstat'
2008-11-28 Junio C HamanoMerge branch 'ta/quiet-pull'
2008-11-16 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-15 Tuncer AyazTeach/Fix pull/fetch -q/-v options
2008-11-13 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-09-25 Shawn O. PearceMerge git://repo.or.cz/git-gui
2008-09-07 Junio C HamanoMerge updated git-gui and gitk that call each other
2008-09-06 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-17 Junio C HamanoMerge git-gui 0.11.0
2008-08-17 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14 Junio C HamanoMerge branch 'maint'
2008-08-13 Junio C HamanoMerge branch 'maint'
2008-08-12 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-09 Junio C HamanoMerge branch 'maint'
2008-08-06 Junio C HamanoSync with 1.5.6.5
2008-08-06 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-08-06 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Junio C HamanoMerge branch 'maint'
2008-08-03 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
2008-07-30 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-27 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-25 Junio C HamanoMerge branch 'maint'
2008-07-24 Junio C HamanoMerge branch 'maint' into ph/checkout
2008-07-21 Junio C HamanoMerge branch 'maint'
2008-07-19 Junio C HamanoMerge branch 'maint'
2008-07-17 Junio C HamanoMerge branch 'sp/maint-index-pack'
2008-07-17 Junio C HamanoMerge branch 'maint'
2008-07-16 Junio C HamanoMerge branch 'mv/merge-in-c'
2008-07-16 Junio C HamanoMerge branch 'ag/rewrite_one'
2008-07-16 Junio C HamanoMerge branch 'js/maint-pretty-mailmap'
2008-07-15 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-15 Junio C HamanoMerge branch 'ls/maint-mailinfo-patch-label'
2008-07-15 Junio C HamanoMerge branch 'jc/branch-merged'
2008-07-15 Junio C HamanoMerge branch 'sp/maint-bash-completion-optim'
2008-07-13 Junio C HamanoMerge branch 'sp/maint-bash-completion-optim'
2008-07-13 Junio C HamanoMerge branch 'maint' to sync with 1.5.6.3
2008-07-13 Junio C HamanoMerge branch 'ph/parseopt-step-blame'
2008-07-13 Junio C HamanoMerge branch 'am/stash-branch'
2008-07-13 Junio C HamanoMerge branch 'sg/stash-k-i'
2008-07-13 Junio C HamanoMerge branch 'jc/report-tracking'
2008-07-13 Junio C HamanoMerge branch 'tr/add-i-e'
2008-07-09 Junio C HamanoMerge branch 'js/apply-root'
2008-07-09 Junio C HamanoMerge branch 'jc/reflog-expire'
2008-07-09 Junio C HamanoMerge branch 'sp/maint-pack-memuse'
2008-07-09 Junio C HamanoMerge branch 'maint'
2008-07-08 Junio C HamanoMerge branch 'jc/blame' (early part) into HEAD
2008-07-08 Junio C HamanoMerge branch 'lt/racy-empty' into maint
2008-07-07 Junio C HamanoMerge branch 'qq/maint'
2008-07-07 Junio C HamanoMerge branch 'js/maint-daemon-syslog'
2008-07-07 Junio C HamanoMerge branch 'maint'
2008-07-07 Junio C HamanoMerge branch 'jc/rerere'
2008-07-07 Junio C HamanoMerge branch 'dr/ceiling'
2008-07-07 Junio C HamanoMerge branch 'db/no-git-config'
2008-07-07 Junio C HamanoMerge branch 'js/import-zip'
2008-07-07 Junio C HamanoMerge branch 'maint'
2008-07-07 Junio C HamanoMerge branch 'qq/maint'
2008-07-06 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-06 Junio C HamanoMerge branch 'qq/maint'
2008-07-06 Junio C HamanoMerge branch 'qq/maint'
2008-07-05 Jonathan Niedermanpages: italicize git command names (which were in...
2008-06-27 Junio C HamanoMerge branch 'maint-1.5.5' into maint
2008-06-25 Junio C HamanoMerge branch 'sr/tests'
2008-06-25 Junio C HamanoMerge branch 'jc/maint-combine-diff-pre-context' into...
2008-06-22 Junio C HamanoMerge branch 'lt/racy-empty'
2008-06-22 Junio C HamanoMerge branch 'jc/maint-combine-diff-pre-context'
2008-06-22 Junio C HamanoMerge branch 'mo/status-untracked'
2008-06-22 Junio C HamanoMerge branch 'kh/update-ref'
2008-06-17 Junio C HamanoMerge branch 'maint'
2008-06-16 Junio C HamanoMerge branch 'maint'
2008-06-11 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-06-11 Junio C HamanoMerge branch 'maint'
2008-06-09 Junio C HamanoMerge branch 'js/merge-recursive'
2008-06-09 Junio C HamanoMerge branch 'maint'
2008-06-08 Stephan BeyerDocs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-07 Junio C HamanoMerge 1.5.5.4 in
2008-06-06 Junio C HamanoMerge branch 'maint'
next