tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
test that git status works with merge conflict in, .gitmodules
[git.git]
/
t
/
t7611-merge-abort.sh
2011-05-13
Junio C Hamano
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'gr/cvsimport-alternative-cvspass-location...
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree' into...
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-diff-files-unmerged' into maint
blob
|
commitdiff
|
raw
2011-05-13
Junio C Hamano
Merge branch 'mz/maint-rename-unmerged' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'jh/dirstat' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'sp/maint-clear-postfields' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-stash-oob' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-upload-pack-shallow' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'jc/pack-objects-bigfile' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'mg/reflog-with-options' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'ar/clean-rmdir-empty' into maint
blob
|
commitdiff
|
raw
2011-05-04
Junio C Hamano
Merge branch 'mg/sha1-path-advise' into maint
blob
|
commitdiff
|
raw
2011-04-29
Junio C Hamano
Merge branch 'mg/x-years-12-months' into maint
blob
|
commitdiff
|
raw
2011-04-19
Junio C Hamano
Sync with 1.7.4.5
blob
|
commitdiff
|
raw
2011-04-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-04-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-04-12
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink'
blob
|
commitdiff
|
raw
2011-04-12
Junio C Hamano
Merge branch 'nd/init-gitdir'
blob
|
commitdiff
|
raw
2011-04-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2011-04-06
Junio C Hamano
Sync with 1.7.4.4
blob
|
commitdiff
|
raw
2011-04-06
Junio C Hamano
Merge branch 'jk/maint-remote-mirror-safer'
blob
|
commitdiff
|
raw
2011-04-06
Junio C Hamano
Merge branch 'mg/doc-revisions-txt'
blob
|
commitdiff
|
raw
2011-04-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-04-04
Junio C Hamano
Merge branch 'jl/submodule-fetch-on-demand'
blob
|
commitdiff
|
raw
2011-04-04
Junio C Hamano
Merge branch 'jc/rev-list-options-fix'
blob
|
commitdiff
|
raw
2011-04-04
Junio C Hamano
Merge branch 'nm/maint-conflicted-submodule-entries'
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-04-03
Junio C Hamano
Merge branch 'jc/index-update-if-able' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-04-03
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-04-03
Junio C Hamano
Sync with 1.7.4.3
blob
|
commitdiff
|
raw
2011-04-02
Junio C Hamano
Merge branch 'nd/init-gitdir'
blob
|
commitdiff
|
raw
2011-04-02
Junio C Hamano
Merge branch 'jc/merge-sans-branch'
blob
|
commitdiff
|
raw
2011-04-02
Junio C Hamano
Merge branch 'jr/grep-en-config'
blob
|
commitdiff
|
raw
2011-04-02
Junio C Hamano
Merge branch 'ab/i18n-st'
blob
|
commitdiff
|
raw
2011-04-01
Junio C Hamano
Merge branch 'nd/index-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-04-01
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-04-01
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-04-01
Junio C Hamano
Merge "checkout ambiguous ref bugfix" into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-03-27
Junio C Hamano
Merge branch 'jc/index-update-if-able'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-27
Junio C Hamano
Merge branch 'jc/maint-rerere-in-workdir'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-27
Junio C Hamano
Merge branch 'nd/index-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-26
Junio C Hamano
Merge git-gui 0.14.0
blob
|
commitdiff
|
raw
|
diff to current
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-23
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-23
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-16
Junio C Hamano
Merge branch 'jn/maint-commit-missing-template' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-03-16
Junio C Hamano
Merge branch 'jk/diffstat-binary' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-03-16
Junio C Hamano
Merge branch 'jn/test-terminal-punt-on-osx-breakage...
blob
|
commitdiff
|
raw
|
diff to current
2011-03-15
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-14
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-10
Ævar Arnfjörð Bjar...
i18n: git-merge basic messages
blob
|
commitdiff
|
raw
2011-03-04
Junio C Hamano
Merge branch 'jn/maint-commit-missing-template'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-04
Junio C Hamano
Merge branch 'jk/diffstat-binary'
blob
|
commitdiff
|
raw
|
diff to current
2011-03-04
Junio C Hamano
Merge branch 'jn/test-terminal-punt-on-osx-breakage'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-28
Junio C Hamano
Merge branch 'uk/checkout-ambiguous-ref'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-28
Junio C Hamano
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-28
Junio C Hamano
Merge branch 'hv/mingw-fs-funnies'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-26
Jonathan Nieder
Merge commit 'jn/svn-fe' of git://github.com/gitster...
blob
|
commitdiff
|
raw
|
diff to current
2011-02-16
Junio C Hamano
Merge branch 'maint-1.7.3' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-02-10
Junio C Hamano
Merge branch 'tr/merge-unborn-clobber'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-10
Junio C Hamano
Merge branch 'jn/unpack-lstat-failure-report'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-10
Junio C Hamano
Merge branch 'cb/setup'
blob
|
commitdiff
|
raw
|
diff to current
2011-02-10
Junio C Hamano
Merge branch 'maint-1.7.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-01-31
Junio C Hamano
Merge branch 'jl/fetch-submodule-recursive' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-01-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-13
Junio C Hamano
Merge branch 'jn/gitweb-no-logo'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-13
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-13
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-05
Junio C Hamano
Merge branch 'maint' to sync with 1.7.3.5
blob
|
commitdiff
|
raw
|
diff to current
2011-01-05
Junio C Hamano
Merge branch 'jn/svn-fe' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2011-01-05
Junio C Hamano
Merge branch 'ao/t9001-fix'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-05
Junio C Hamano
Merge branch 'mg/cvsimport'
blob
|
commitdiff
|
raw
|
diff to current
2011-01-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-28
Junio C Hamano
Merge branch 'jc/maint-rebase-rewrite-last-skip'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-28
Junio C Hamano
Merge branch 'nd/setup'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-23
Junio C Hamano
Merge branch 'rj/maint-difftool-cygwin-workaround'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-22
Junio C Hamano
Merge branch 'rj/maint-test-fixes'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-22
Junio C Hamano
Merge branch 'jc/maint-am-abort-safely'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-22
Junio C Hamano
Merge branch 'jk/commit-die-on-bogus-ident'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-22
Junio C Hamano
Merge branch 'pd/bash-4-completion'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-22
Junio C Hamano
Merge branch 'nd/maint-fix-add-typo-detection'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-22
Junio C Hamano
Merge branch 'tf/commit-list-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-21
Junio C Hamano
Merge branch 'ks/blame-worktree-textconv-cached'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-21
Junio C Hamano
Merge branch 'jk/t2107-now-passes'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-21
Junio C Hamano
Merge branch 'jk/maint-decorate-01-bool'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-21
Junio C Hamano
Merge branch 'nd/oneline-sha1-name-from-specific-ref'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-21
Junio C Hamano
Merge branch 'jn/maint-gitweb-pathinfo-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-16
Junio C Hamano
Merge branch 'kb/diff-C-M-synonym'
blob
|
commitdiff
|
raw
|
diff to current
2010-12-16
Junio C Hamano
Merge branch 'jn/fast-import-blob-access'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
