Code

modify/delete conflict resolution overwrites untracked file
[git.git] / builtin-tag.c
2008-12-07 Jeff Kingtag: delete TAG_EDITMSG only on successful tag
2008-12-03 Junio C HamanoMerge branch 'jk/maint-commit-v-strip' into maint
2008-12-03 Junio C HamanoMerge branch 'bc/maint-keep-pack' into maint
2008-12-03 Junio C HamanoMerge branch 'js/mingw-rename-fix' into maint
2008-12-01 Junio C HamanoMerge branch 'st/maint-tag' into maint
2008-11-09 Junio C HamanoMerge branch 'cb/maint-update-ref-fix' into maint
2008-11-09 Junio C HamanoMerge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Junio C HamanoMerge branch 'ar/maint-mksnpath' into maint
2008-11-09 Junio C HamanoMerge branch 'mv/maint-branch-m-symref' into maint
2008-11-04 Samuel Tardieutag: Check that options are only allowed in the appropr...
2008-11-02 Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-31 Alex RiesenUse git_pathdup instead of xstrdup(git_path(...))
2008-10-26 Miklos VajnaFix git branch -m for symrefs.
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-07 Junio C HamanoMerge branch 'lt/config-fsync' into maint
2008-08-07 Junio C HamanoMerge branch 'jc/reflog-expire' into maint
2008-08-07 Junio C HamanoMerge branch 'ag/rewrite_one' into maint
2008-08-06 Junio C HamanoSync with 1.5.6.5
2008-08-06 Junio C HamanoFiles given on the command line are relative to $cwd
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-26 Stephan Beyereditor.c: Libify launch_editor()
2008-07-26 Stephan BeyerMove launch_editor() from builtin-tag.c to editor.c
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 'ap/trackinfo' v1.6.0-rc0
2008-07-21 Junio C HamanoMerge branch 'jc/rerere-auto-more'
2008-07-21 Junio C HamanoMerge branch 'ns/am-abort'
2008-07-21 Junio C HamanoMerge branch 'maint'
2008-07-19 Junio C HamanoMerge branch 'maint'
2008-07-17 Junio C HamanoMerge branch 'mv/dashless'
2008-07-17 Junio C HamanoMerge branch 'ls/mailinfo'
2008-07-17 Junio C HamanoMerge branch 'sb/dashless'
2008-07-17 Junio C HamanoMerge branch 'rs/archive'
2008-07-17 Junio C HamanoMerge branch 'ag/blame'
2008-07-17 Junio C HamanoMerge branch 'rs/rebase-checkout-not-so-quiet'
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 'js/maint-daemon-syslog' into 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 'sp/win'
2008-07-15 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-15 Junio C HamanoMerge branch 'jc/branch-merged'
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-13 Stephan BeyerMake usage strings dash-less
2008-07-12 Johannes SchindelinConvert CR/LF to LF in tag signatures
2008-07-09 Junio C HamanoMerge branch 'jk/pager-config'
2008-07-09 Junio C HamanoMerge branch 'js/apply-root'
2008-07-09 Junio C HamanoMerge branch 'jc/reflog-expire'
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 'js/maint-daemon-syslog'
2008-07-07 Junio C HamanoMerge branch 'qq/maint' (early part) into 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-06 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-06 Christian CouderFix "config_error_nonbool" used with value instead...
2008-07-06 Christian CouderFix "config_error_nonbool" used with value instead...
2008-06-27 Junio C HamanoMerge branch 'maint-1.5.5' into maint
2008-06-27 Junio C HamanoMerge branch 'maint-1.5.4' into maint-1.5.5
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-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-07 Junio C HamanoMerge 1.5.5.4 in
2008-06-06 Junio C HamanoMerge branch 'maint'
2008-06-04 Junio C HamanoMerge branch 'maint'
2008-05-28 Junio C HamanoMerge 1.5.5.3 in
2008-05-27 Junio C HamanoMerge branch 'jc/diff-no-no-index'
2008-05-27 Junio C HamanoMerge branch 'maint'
2008-05-27 Junio C HamanoMerge git://repo.or.cz/git-gui
2008-05-26 Junio C HamanoMerge branch 'maint'
2008-05-26 Junio C HamanoMerge branch 'maint-1.5.4' into maint
next