git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / git-commit.txt
2008-06-17 Merge branch 'maint'
2008-06-16 Merge branch 'maint'
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-06-11 Merge branch 'maint'
2008-06-09 Merge branch 'js/merge-recursive'
2008-06-09 Merge branch 'maint'
2008-06-09 Add configuration option for default untracked files...
2008-06-09 Add argument 'no' commit/status option -u|--untracked...
2008-06-09 Add an optional <mode> argument to commit/status -u...
2008-06-08 Docs: Use "-l::\n--long\n" format in OPTIONS sections
2008-06-08 git-commit.txt: Add missing long/short options
2008-06-08 git-commit.txt: Correct option alternatives
2008-06-07 Merge 1.5.5.4 in
2008-06-06 documentation: move git(7) to git(1)
2008-06-06 Merge branch 'maint'
2008-06-04 Merge branch 'maint'
2008-05-28 Merge 1.5.5.3 in
2008-05-27 Merge branch 'maint'
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-26 Merge branch 'maint'
2008-05-26 Merge branch 'maint-1.5.4' into maint
2008-05-25 Merge branch 'js/config-cb' v1.5.6-rc0
2008-05-25 Merge branch 'db/clone-in-c'
2008-05-25 Merge branch 'ar/batch-cat'
2008-05-25 Merge branch 'ap/svn'
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-23 Merge branch 'pb/push'
2008-05-23 Merge branch 'bc/repack'
2008-05-23 Merge branch 'sp/ignorecase'
2008-05-23 Merge branch 'maint'
2008-05-23 Merge branch 'maint-1.5.4' into maint v1.5.5.2
2008-05-21 Merge branch 'maint'
2008-05-21 Merge branch 'maint-1.5.4' into maint
2008-05-21 Merge branch 'ar/add-unreadable'
2008-05-21 Merge branch 'ds/branch-auto-rebase'
2008-05-21 Merge branch 'sv/first-parent'
2008-05-21 Merge branch 'np/pack'
2008-05-21 Merge branch 'as/graph'
2008-05-21 Merge branch 'jk/maint-send-email-compose'
2008-05-21 Merge branch 'hb/maint-send-email-quote-recipients'
2008-05-17 Merge branch 'maint'
2008-05-15 Merge git://repo.or.cz/git-gui
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-14 Merge branch 'maint'
2008-05-14 Merge branch 'maint-1.5.4' into maint
2008-05-14 Merge branch 'sb/committer'
2008-05-14 Merge branch 'bd/tests'
2008-05-14 Merge branch 'mv/format-cc'
2008-05-14 Merge branch 'cc/hooks-doc'
2008-05-11 Merge branch 'maint-1.5.4' into maint
2008-05-11 Merge branch 'lt/case-insensitive'
2008-05-09 Merge branch 'maint-1.5.4' into maint
2008-05-06 Merge branch 'bc/filter-branch'
2008-05-06 Merge branch 'lh/git-file'
2008-05-06 Merge branch 'jk/fetch-status'
2008-05-05 Documentation: rename "hooks.txt" to "githooks.txt...
2008-05-04 Merge branch 'maint-1.5.4' into maint
2008-04-30 Merge branch 'maint-1.5.4' into maint
2008-04-28 Merge branch 'maint-1.5.4' into maint
2008-04-25 Merge branch 'maint-1.5.4' into maint
2008-04-23 Merge branch 'maint-1.5.4' into maint
2008-04-20 Merge branch 'jc/sha1-lookup'
2008-04-20 Merge branch 'jc/dirstat'
2008-04-20 Merge branch 'mv/defer-gc'
2008-04-20 Merge branch 'jc/terminator-separator'
2008-04-20 Merge branch 'jk/remote-default-show'
2008-04-20 Merge branch 'mk/color'
2008-04-19 Merge branch 'maint-1.5.4' into maint
2008-04-17 Merge branch 'maint-1.5.4' into maint
2008-04-16 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint'
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-11 Document option --only of git commit
2008-04-10 Merge branch 'maint-1.5.4' into maint
2008-04-09 Merge branch 'jc/rename'
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-07 Merge branch 'jc/maint-apply-match-beginning'
2008-04-05 Merge git://repo.or.cz/git-gui
2008-04-02 Merge git://repo.or.cz/git-gui
2008-03-28 GIT 1.5.5-rc2 v1.5.5-rc2
2008-03-27 Merge branch 'maint'
2008-03-26 Merge branch 'jc/maint-fetch-regression-1.5.4'
2008-03-16 Merge branch 'maint'
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-15 Merge branch 'maint'
2008-03-15 Merge branch 'maint'
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-14 Merge branch 'maint'
2008-03-13 Merge branch 'maint'
2008-03-12 Merge git://repo.or.cz/git-gui
2008-03-12 Merge branch 'maint'
2008-03-11 Merge branch 'maint'
2008-03-09 Merge branch 'kb/maint-filter-branch-disappear'
2008-03-09 Merge branch 'maint' to sync with 1.5.4.4
2008-03-08 Merge branch 'aw/maint-shortlog-blank-lines'
2008-03-08 Merge branch 'maint'
2008-03-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-04 Merge branch 'maint'
2008-03-03 Merge branch 'maint'
next