Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
[gitweb.git]
/
t
/
t7110-reset-merge.sh
2010-02-26
Merge branch 'maint-1.6.6' into maint
blob
|
diff
|
raw
2010-02-24
Merge branch 'ml/maint-grep-doc' into maint
blob
|
diff
|
raw
2010-02-21
Merge branch 'ml/maint-grep-doc'
blob
|
diff
|
raw
2010-02-21
Merge branch 'hm/maint-imap-send-crlf'
blob
|
diff
|
raw
2010-02-21
Merge branch 'jc/maint-fix-test-perm'
blob
|
diff
|
raw
2010-02-19
Merge branch 'jk/maint-rmdir-fix' into maint
blob
|
diff
|
raw
2010-02-16
Merge branch 'maint-1.6.6' into maint
blob
|
diff
|
raw
2010-02-15
Merge branch 'maint-1.6.6' into maint
blob
|
diff
|
raw
2010-02-12
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-12
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-10
Sync with 1.6.6.2
blob
|
diff
|
raw
2010-02-10
Merge branch 'sp/maint-push-sideband' into sp/push...
blob
|
diff
|
raw
2010-02-09
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-07
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
diff
|
raw
2010-02-07
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-06
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-02-06
Merge branch 'sp/maint-push-sideband' into sp/push...
blob
|
diff
|
raw
2010-02-06
Merge branch 'maint'
blob
|
diff
|
raw
2010-02-01
Merge branch 'sp/maint-fast-import-large-blob' into...
blob
|
diff
|
raw
2010-01-30
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-29
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-01-28
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-28
Merge branch 'gp/maint-cvsserver'
blob
|
diff
|
raw
2010-01-27
Merge branch 'jc/maint-reflog-bad-timestamp'
blob
|
diff
|
raw
2010-01-27
Merge branch 'il/maint-colon-address'
blob
|
diff
|
raw
2010-01-27
Merge branch 'il/maint-xmallocz'
blob
|
diff
|
raw
2010-01-27
Merge branch 'jh/maint-config-file-prefix'
blob
|
diff
|
raw
2010-01-25
Merge branch 'jc/fix-tree-walk'
blob
|
diff
|
raw
2010-01-24
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-24
Merge branch 'doc-style/for-next' of git://repo.or...
blob
|
diff
|
raw
2010-01-23
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-23
Merge branch 'jc/branch-d'
blob
|
diff
|
raw
2010-01-23
Merge branch 'js/refer-upstream'
blob
|
diff
|
raw
2010-01-23
Merge branch 'jc/maint-limit-note-output'
blob
|
diff
|
raw
2010-01-22
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-21
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-21
Merge branch 'ag/patch-header-verify'
blob
|
diff
|
raw
2010-01-21
Merge branch 'jc/conflict-marker-size'
blob
|
diff
|
raw
2010-01-21
Merge branch 'ag/maint-apply-too-large-p'
blob
|
diff
|
raw
2010-01-21
Merge branch 'ap/merge-backend-opts'
blob
|
diff
|
raw
2010-01-21
Merge remote branch 'remotes/trast-doc/for-next'
blob
|
diff
|
raw
2010-01-21
Merge branch 'jh/notes' (early part)
blob
|
diff
|
raw
2010-01-21
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-20
Merge branch 'rr/core-tutorial'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/cache-unmerge'
blob
|
diff
|
raw
2010-01-20
Merge branch 'js/exec-error-report'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/ls-files-ignored-pathspec'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/grep-lookahead'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/maint-strbuf-add-fix-doubling'
blob
|
diff
|
raw
2010-01-20
Merge branch 'mm/conflict-advice'
blob
|
diff
|
raw
2010-01-20
Merge branch 'da/difftool'
blob
|
diff
|
raw
2010-01-20
Merge branch 'mh/rebase-fixup'
blob
|
diff
|
raw
2010-01-20
Merge branch 'ns/rebase-auto-squash'
blob
|
diff
|
raw
2010-01-20
Merge branch 'mh/rebase-fixup' (early part)
blob
|
diff
|
raw
2010-01-20
Merge branch 'jk/warn-author-committer-after-commit'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/ident'
blob
|
diff
|
raw
2010-01-20
Merge branch 'tr/http-push-ref-status'
blob
|
diff
|
raw
2010-01-20
Merge branch 'bk/fix-relative-gitdir-file'
blob
|
diff
|
raw
2010-01-20
Merge branch 'sd/cd-p-show-toplevel'
blob
|
diff
|
raw
2010-01-20
Merge branch 'jc/symbol-static'
blob
|
diff
|
raw
2010-01-20
Sync with 1.6.6.1
blob
|
diff
|
raw
2010-01-20
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-19
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-19
Merge branch 'jc/rerere'
blob
|
diff
|
raw
2010-01-19
Merge branch 'pc/uninteresting-submodule-disappear...
blob
|
diff
|
raw
2010-01-19
Merge branch 'nd/include-termios-for-osol'
blob
|
diff
|
raw
2010-01-18
Merge branch 'tc/test-locate-httpd'
blob
|
diff
|
raw
2010-01-18
Merge branch 'jh/commit-status'
blob
|
diff
|
raw
2010-01-17
Merge branch 'jn/makefile'
blob
|
diff
|
raw
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
2010-01-17
Merge branch 'tc/clone-v-progress'
blob
|
diff
|
raw
2010-01-17
Merge branch 'tc/smart-http-restrict'
blob
|
diff
|
raw
2010-01-17
Merge branch 'jk/run-command-use-shell'
blob
|
diff
|
raw
2010-01-17
Merge branch 'sr/gfi-options'
blob
|
diff
|
raw
2010-01-17
Merge branch 'maint'
blob
|
diff
|
raw
2010-01-13
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-13
Merge branch 'rs/maint-archive-match-pathspec'
blob
|
diff
|
raw
2010-01-13
Merge branch 'il/vcs-helper'
blob
|
diff
|
raw
2010-01-13
Merge branch 'cc/reset-more'
blob
|
diff
|
raw
2010-01-04
"reset --merge": fix unmerged case
blob
|
diff
|
raw
2010-01-03
reset: use "unpack_trees()" directly instead of "git...
blob
|
diff
|
raw
|
diff to current
2009-12-30
reset: add a few tests for "git reset --merge"
blob
|
diff
|
raw
|
diff to current