tokkee.org
Code
projects
/
git.git
/ shortlog
commit
grep
author
committer
pickaxe
?
search:
re
summary
| shortlog |
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
git.git
2011-08-14
Elijah Newren
merge-recursive: Small cleanups for conflict_rename_ren...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Fix rename/rename(1to2) resolution...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Introduce a merge_file convenience...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Fix modify/delete resolution in the...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: When we detect we can skip an update...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Provide more info in conflict markers...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Cleanup and consolidation of rename_co...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Consolidate process_entry() and proces...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Improve handling of rename target...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Add comments about handling rename...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Make dead code for rename/rename(2to1...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Fix deletion of untracked file in...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Split update_stages_and_entry; only...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Allow make_room_for_path() to remove...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Johannes Sixt
string-list: Add API to remove an item from an unsorted...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Split was_tracked() out of would_lose_...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Save D/F conflict filenames instead...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Fix code checking for D/F conflicts...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Fix sorting order and directory change...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Fix recursive case with D/F conflict...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Avoid working directory changes during...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Remember to free generated unique...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Consolidate different update_stages...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Mark some diff_filespec struct argumen...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Correct a comment
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
merge-recursive: Make BUG message more legible by addin...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6022: Add testcase for merging a renamed file with...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6022: New tests checking for unnecessary updates of...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6022: Remove unnecessary untracked files to make test...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6036: criss-cross + rename/rename(1to2)/add-source...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6036: criss-cross w/ rename/rename(1to2)/modify+rename...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6036: tests for criss-cross merges with various direct...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6036: criss-cross with weird content can fool git...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6036: Add differently resolved modify/delete conflict...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6042: Add failing testcases for rename/rename/add...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6042: Ensure rename/rename conflicts leave index and...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6042: Add tests for content issues with modify/rename...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6042: Add a testcase where undetected rename causes...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6042: Add a pair of cases where undetected renames...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6042: Add failing testcase for rename/modify/add-sourc...
commit
|
commitdiff
|
tree
|
snapshot
2011-08-14
Elijah Newren
t6042: Add a testcase where git deletes an untracked...
commit
|
commitdiff
|
tree
|
snapshot
2011-06-09
Jim Meyering
fetch: do not leak a refspec
commit
|
commitdiff
|
tree
|
snapshot
2011-06-01
Junio C Hamano
Git 1.7.5.4
v1.7.5.4
commit
|
commitdiff
|
tree
|
snapshot
2011-06-01
Junio C Hamano
Merge branch 'jk/maint-config-alias-fix' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-06-01
Junio C Hamano
Merge branch 'jc/fmt-req-fix' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-06-01
Junio C Hamano
Merge branch 'jk/maint-docs' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-06-01
Junio C Hamano
Merge branch 'jn/doc-remote-helpers' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-06-01
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-06-01
Jim Meyering
diffcore-rename.c: avoid set-but-not-used warning
commit
|
commitdiff
|
tree
|
snapshot
2011-05-31
Junio C Hamano
Start 1.7.5.4 draft release notes
commit
|
commitdiff
|
tree
|
snapshot
2011-05-31
Junio C Hamano
Merge branch 'tr/add-i-no-escape' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-31
Junio C Hamano
Merge branch 'vh/config-interactive-singlekey-doc'...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-31
Junio C Hamano
Merge branch 'ml/test-readme' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-31
Junio C Hamano
Merge branch 'ab/i18n-fixup' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-31
Junio C Hamano
Merge branch 'jc/rename-degrade-cc-to-c' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-31
Junio C Hamano
Merge branch 'rr/doc-content-type' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-30
Jonathan Nieder
Documentation: do not misinterpret refspecs as bold...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-30
Junio C Hamano
Merge branch 'jm/maint-misc-fix' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-30
Junio C Hamano
Merge branch 'bc/maint-submodule-fix-parked' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-30
Junio C Hamano
Merge branch 'bc/maint-api-doc-parked' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-30
Junio C Hamano
Merge branch 'jn/run-command-error-failure' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-27
Junio C Hamano
config.mak.in: allow "configure --sysconfdir=/else...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-27
Jeff King
docs: fix some antique example output
commit
|
commitdiff
|
tree
|
snapshot
2011-05-27
Jeff King
docs: make sure literal "->" isn't converted to arrow
commit
|
commitdiff
|
tree
|
snapshot
2011-05-27
Jeff King
docs: update status --porcelain format
commit
|
commitdiff
|
tree
|
snapshot
2011-05-27
Jeff King
docs: minor grammar fixes to git-status
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Brandon Casey
git-submodule.sh: separate parens by a space to avoid...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Brandon Casey
Documentation/technical/api-diff.txt: correct name...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Jeff King
read_gitfile_gently: use ssize_t to hold read result
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Jim Meyering
remove tests of always-false condition
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Jim Meyering
rerere.c: diagnose a corrupt MERGE_RR when hitting...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Git 1.7.5.3
v1.7.5.3
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'maint-1.7.4' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'jk/git-connection-deadlock-fix' into...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'jk/maint-upload-pack-shallow' into maint...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'jm/maint-diff-words-with-sbe' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'mg/diff-uiconfig-doc' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'ft/gitweb-tar-with-gzip-n' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'ss/doc-svn' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'jn/format-patch-doc' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'jc/maint-pathspec-stdin-and-cmdline'...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'jk/cherry-pick-root-with-resolve' into...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'rg/copy-gecos-username' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'fc/completion-zsh' into maint
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'jk/git-connection-deadlock-fix' into...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-26
Junio C Hamano
Merge branch 'svn-fe-maint' of git://repo.or.cz/git...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-25
Junio C Hamano
userformat_find_requirements(): find requirement for...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-25
Nguyen Thai...
init/clone: remove short option -L and document --separ...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-24
Junio C Hamano
handle_options(): do not miscount how many arguments...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-24
Jeff King
config: always parse GIT_CONFIG_PARAMETERS during git_c...
commit
|
commitdiff
|
tree
|
snapshot
2011-05-24
Jeff King
git_config: don't peek at global config_parameters
commit
|
commitdiff
|
tree
|
snapshot
2011-05-24
Jeff King
config: make environment parsing routines static
commit
|
commitdiff
|
tree
|
snapshot
2011-05-20
Jim Meyering
do not read beyond end of malloc'd buffer
commit
|
commitdiff
|
tree
|
snapshot
2011-05-20
Michael J Gruber
git-svn: Fix git svn log --show-commit
commit
|
commitdiff
|
tree
|
snapshot
2011-05-20
Junio C Hamano
Git 1.7.5.2
v1.7.5.2
commit
|
commitdiff
|
tree
|
snapshot
2011-05-20
Jonathan Nieder
provide a copy of the LGPLv2.1
commit
|
commitdiff
|
tree
|
snapshot
2011-05-18
Jeff King
test core.gitproxy configuration
commit
|
commitdiff
|
tree
|
snapshot
next