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
/
2011-05-14
Heiko Voigt
test that git status works with merge conflict in,...
tree
|
commitdiff
2011-05-13
Junio C Hamano
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
tree
|
commitdiff
2011-05-13
Junio C Hamano
Merge branch 'js/blame-parsename' into maint
tree
|
commitdiff
2011-05-13
Junio C Hamano
Merge branch 'gr/cvsimport-alternative-cvspass-location...
tree
|
commitdiff
2011-05-13
Junio C Hamano
Merge branch 'cj/p4merge' into maint
tree
|
commitdiff
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree' into...
tree
|
commitdiff
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-diff-files-unmerged' into maint
tree
|
commitdiff
2011-05-13
Junio C Hamano
Merge branch 'mz/maint-rename-unmerged' into maint
tree
|
commitdiff
2011-05-13
Johan Herland
t5400: Fix a couple of typos
tree
|
commitdiff
2011-05-05
Junio C Hamano
t3701: fix here document
tree
|
commitdiff
2011-05-05
Brian Gernhardt
t/annotate-tests: Use echo & cat instead of sed
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'jh/dirstat' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'sp/maint-clear-postfields' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-stash-oob' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-upload-pack-shallow' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'dm/stash-k-i-p' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'jc/pack-objects-bigfile' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'mg/reflog-with-options' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'jk/stash-loosen-safety' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'ar/clean-rmdir-empty' into maint
tree
|
commitdiff
2011-05-04
Junio C Hamano
Merge branch 'mg/sha1-path-advise' into maint
tree
|
commitdiff
2011-04-29
Jeff King
merge-one-file: fix broken merges with alternate work...
tree
|
commitdiff
2011-04-29
Jeff King
add tests for merge-index / merge-one-file
tree
|
commitdiff
2011-04-29
Junio C Hamano
Merge branch 'mg/x-years-12-months' into maint
tree
|
commitdiff
2011-04-29
Josh Stone
blame: tolerate bogus e-mail addresses a bit better
tree
|
commitdiff
2011-04-28
Andrew Wong
git-rebase--interactive.sh: preserve-merges fails on...
tree
|
commitdiff
2011-04-24
Junio C Hamano
diff-files: show unmerged entries correctly
tree
|
commitdiff
2011-04-24
Junio C Hamano
test: use $_z40 from test-lib
tree
|
commitdiff
2011-04-21
Michael J Gruber
date: avoid "X years, 12 months" in relative dates
tree
|
commitdiff
2011-04-19
Junio C Hamano
Sync with 1.7.4.5
tree
|
commitdiff
2011-04-14
Junio C Hamano
Merge branch 'maint'
tree
|
commitdiff
2011-04-14
Michael J Gruber
t3306,t5304: avoid clock skew issues
tree
|
commitdiff
2011-04-13
Junio C Hamano
Merge branch 'maint'
tree
|
commitdiff
2011-04-13
Junio C Hamano
Merge branch 'jc/rev-list-options-fix' into maint
tree
|
commitdiff
2011-04-13
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink' into maint
tree
|
commitdiff
2011-04-12
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink'
tree
|
commitdiff
2011-04-12
Junio C Hamano
Merge branch 'nd/init-gitdir'
tree
|
commitdiff
2011-04-12
Johannes Sixt
t2021: mark a test as fixed
tree
|
commitdiff
2011-04-12
Johannes Sixt
t0001: guard a new test with SYMLINKS prerequisite
tree
|
commitdiff
2011-04-11
Johan Herland
Teach --dirstat not to completely ignore rearranged...
tree
|
commitdiff
2011-04-11
Johan Herland
--dirstat-by-file: Make it faster and more correct
tree
|
commitdiff
2011-04-11
Johan Herland
--dirstat: Describe non-obvious differences relative...
tree
|
commitdiff
2011-04-11
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
tree
|
commitdiff
2011-04-07
Dan McGee
stash: ensure --no-keep-index and --patch can be used...
tree
|
commitdiff
2011-04-07
Dan McGee
stash: add two more tests for --no-keep-index
tree
|
commitdiff
2011-04-06
Junio C Hamano
Sync with 1.7.4.4
tree
|
commitdiff
2011-04-06
Junio C Hamano
Merge branch 'nm/maint-conflicted-submodule-entries...
tree
|
commitdiff
2011-04-06
Junio C Hamano
Merge branch 'mg/rev-list-n-reverse-doc' into maint
tree
|
commitdiff
2011-04-06
Junio C Hamano
Merge branch 'jk/maint-remote-mirror-safer'
tree
|
commitdiff
2011-04-06
Junio C Hamano
Merge branch 'mg/doc-revisions-txt'
tree
|
commitdiff
2011-04-06
Jeff King
stash: drop dirty worktree check on apply
tree
|
commitdiff
2011-04-06
Jon Seymour
stash: fix false positive in the invalid ref test.
tree
|
commitdiff
2011-04-06
Jeff King
stash: fix accidental apply of non-existent stashes
tree
|
commitdiff
2011-04-04
Junio C Hamano
Merge branch 'maint'
tree
|
commitdiff
2011-04-04
Junio C Hamano
Merge branch 'jl/submodule-fetch-on-demand'
tree
|
commitdiff
2011-04-04
Junio C Hamano
Merge branch 'jc/rev-list-options-fix'
tree
|
commitdiff
2011-04-04
Junio C Hamano
Merge branch 'nm/maint-conflicted-submodule-entries'
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'maint'
tree
|
commitdiff
2011-04-03
Jeff King
pull: do not clobber untracked files on initial pull
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'jc/index-update-if-able' into maint
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'lt/default-abbrev' into maint
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'jc/maint-rev-list-culled-boundary' into...
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'mm/maint-log-n-with-diff-filtering' into...
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'jk/format-patch-multiline-header' into...
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'jn/maint-instaweb-plack-fix' into maint
tree
|
commitdiff
2011-04-03
Junio C Hamano
Merge branch 'lp/config-vername-check' into maint
tree
|
commitdiff
2011-04-03
Michael J Gruber
sha1_name: Suggest commit:./file for path in subdir
tree
|
commitdiff
2011-04-03
Michael J Gruber
t1506: factor out test for "Did you mean..."
tree
|
commitdiff
2011-04-03
Ævar Arnfjörð Bjar...
t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT
tree
|
commitdiff
2011-04-03
Junio C Hamano
Sync with 1.7.4.3
tree
|
commitdiff
2011-04-02
Junio C Hamano
Merge branch 'nd/init-gitdir'
tree
|
commitdiff
2011-04-02
Junio C Hamano
Merge branch 'jc/merge-sans-branch'
tree
|
commitdiff
2011-04-02
Junio C Hamano
Merge branch 'jr/grep-en-config'
tree
|
commitdiff
2011-04-02
Junio C Hamano
Merge branch 'ab/i18n-st'
tree
|
commitdiff
2011-04-02
Junio C Hamano
Merge branch 'jk/pull-into-empty'
tree
|
commitdiff
2011-04-02
Junio C Hamano
Merge branch 'sb/sparse-more'
tree
|
commitdiff
2011-04-02
Junio C Hamano
Merge branch 'maint'
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'nd/index-doc' into maint
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'pk/stash-apply-status-relative' into...
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-diff-q-filter' into maint
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'js/maint-stash-index-copy' into maint
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'mg/doc-bisect-tweak-worktree' into maint
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'jh/maint-do-not-track-non-branches' into...
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'fk/maint-cvsimport-early-failure' into...
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-apply-report-offset' into maint
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'jc/maint-apply-no-double-patch' into...
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink' into maint
tree
|
commitdiff
2011-04-01
Junio C Hamano
Merge "checkout ambiguous ref bugfix" into maint
tree
|
commitdiff
2011-04-01
Michael J Gruber
reflog: fix overriding of command line options
tree
|
commitdiff
2011-04-01
Michael J Gruber
t/t1411: test reflog with formats
tree
|
commitdiff
2011-04-01
Alex Riesen
clean: unreadable directory may still be rmdir-able...
tree
|
commitdiff
2011-03-31
Junio C Hamano
Merge branch 'maint'
tree
|
commitdiff
2011-03-31
Nicolas Morey-Chai...
submodule: process conflicting submodules only once
tree
|
commitdiff
2011-03-30
Junio C Hamano
Merge branch 'maint'
tree
|
commitdiff
2011-03-30
Jeff King
remote: separate the concept of push and fetch mirrors
tree
|
commitdiff
2011-03-30
Joe Ratterman
grep: allow -E and -n to be turned on by default via...
tree
|
commitdiff
2011-03-30
Junio C Hamano
t8001: check the exit status of the command being tested
tree
|
commitdiff
2011-03-30
Michael Witten
Typos: t/README
tree
|
commitdiff
2011-03-30
Junio C Hamano
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
tree
|
commitdiff
2011-03-30
Jeff King
tests: kill backgrounded processes more robustly
tree
|
commitdiff
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
