tokkee.org
Code
projects
/
git.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Fix "add -u" that sometimes fails to resolve unmerged paths
2011-04-24
Junio C Hamano
Fix "add -u" that sometimes fails to resolve unmerged...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-files: show unmerged entries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: remove often unused parameters from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff.c: return filepair from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use $_z40 from test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-18
Junio C Hamano
Git 1.7.3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-18
Junio C Hamano
Merge branch 'js/ls-files-x-doc'
commit
|
commitdiff
|
tree
2010-09-16
Junio C Hamano
Merge branch 'bg/fix-t7003'
commit
|
commitdiff
|
tree
2010-09-16
Junio C Hamano
ls-files documentation: reword for consistency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Git 1.7.3 rc2
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'os/fix-rebase-diff-no-prefix'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'jl/fix-test'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'ch/maint-cannot-create-bundle-error'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'ks/recursive-rename-add-identical'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
commit
|
commitdiff
|
tree
2010-09-12
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-12
Junio C Hamano
ls-tree $di $dir: do not mistakenly recurse into directories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
Junio C Hamano
t3101: modernise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Git 1.7.3 rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Merge branch 'np/relnotes-in-subdir'
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Prepare for 1.7.3 rc1
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-09
Junio C Hamano
install-webdoc: keep installed RelNotes-*.txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch 'tf/cleanup-builtin-help-headers'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch 'jk/test-must-fail-missing'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch 'jh/error-removing-missing-note'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch 'kf/askpass-config'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch 'bc/maint-fetch-url-only'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch 'jk/maint-pass-c-config-in-env'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
commit
|
commitdiff
|
tree
2010-09-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge branch 'jh/clean-exclude'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge branch 'jl/maint-fix-test'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge branch 'xx/trivial' into maint
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
tag.c: whitespace breakages fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'jl/submodule-ignore-diff'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'ab/test-2'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'js/detached-stash'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'js/maint-reflog-beyond-horizon'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'dg/local-mod-error-messages'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'nd/maint-fix-replace'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'ab/compat-regex'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'nd/clone-depth-zero'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/maint-doc-user-manual-html-doctype'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'cb/maint-mergetool-no-tty'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/apply-filename-with-sp'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/merge-custom-no-trivial'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jc/maint-doc-em-dash'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'mg/doc-bundle'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/doc-backslash'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/update-contrib-example-merge'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/merge-renormalize'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Sync with 1.7.2.3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Git 1.7.2.3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Prepare for 1.7.3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Prepare for 1.7.2.3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge branch 'gp/pack-refs-remove-empty-dirs' into...
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge branch 'sg/rerere-gc-old-still-used' into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge branch 'np/maint-huge-delta-generation' into...
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge branch 'dj/fetch-tagopt' into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge branch 'da/fix-submodule-sync-superproject-config...
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix' into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
install-webdoc: filter timestamp-only changes correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'np/maint-huge-delta-generation'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'da/fix-submodule-sync-superproject-config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'jn/cherry-revert-message-clean-up'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'cb/binary-patch-id'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'dj/fetch-tagopt'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'jn/svn-fe'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'tr/maint-no-unquote-plus'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'jn/maint-setup-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'en/fast-export-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'hv/autosquash-config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'sg/rerere-gc-old-still-used'
commit
|
commitdiff
|
tree
2010-08-30
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-30
Junio C Hamano
Merge branch 'maint-1.7.1' into maint
commit
|
commitdiff
|
tree
2010-08-26
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-24
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-24
Junio C Hamano
Work around em-dash handling in newer AsciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-23
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
autoconf: regex library detection typofix
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'mm/rebase-i-exec'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'gb/split-cmdline-errmsg'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'so/http-user-agent'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'mm/shortopt-detached'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'sr/local-config'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'nd/fix-sparse-checkout'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'hv/submodule-find-ff-merge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'dg/local-mod-error-messages'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'po/userdiff-csharp'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'ab/perl-install'
commit
|
commitdiff
|
tree
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
