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
2010-11-17
Brian Gernhardt
t6022: Use -eq not = to test output of wc -l
commit
|
commitdiff
|
tree
|
snapshot
2010-10-21
Junio C Hamano
merge-recursive:make_room_for_directories - work around...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Remove redundant path clearing for...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Make room for directories in D/F conflicts
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
handle_delete_modify(): Check whether D/F conflicts...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge_content(): Check whether D/F conflicts are still...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
conflict_rename_rename_1to2(): Fix checks for presence...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
conflict_rename_delete(): Check whether D/F conflicts...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Delay modify/delete conflicts if D...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Delay content merging for renames
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Delay handling of rename/delete conflicts
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Move handling of double rename of...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Move handling of double rename of...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Avoid doubly merging rename/add confli...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Update merge_content() call signature
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Update conflict_rename_rename_1to2...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Structure process_df_entry() to handle...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Have process_entry() skip D/F or renam...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: New function to assist resolving renam...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: New data structures for deferring...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Move process_entry's content merging...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Move delete/modify handling into dedic...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Move rename/delete handling into dedic...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Nuke rename/directory conflict detection
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Rename conflict_rename_rename*() for...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
merge-recursive: Small code clarification -- variable...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6036: Add testcase for undetected conflict
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6036: Add a second testcase similar to the first but...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6036: Test index and worktree state, not just that...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6020: Add a testcase for modify/delete + directory...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6020: Modernize style a bit
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6022: Add tests for rename/rename combined with D...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6022: Add paired rename+D/F conflict: (two/file, one...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6022: Add tests with both rename source & dest involve...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6022: Add tests for reversing order of merges when...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6022: Add test combinations of {content conflict?...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Elijah Newren
t6032: Add a test checking for excessive output from...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Junio C Hamano
merge-recursive: Restructure showing how to chain more...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Schalk, Ken
t3030: Add a testcase for resolvable rename/add conflic...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-30
Junio C Hamano
Merge branch 'en/rename-d-f' into en/merge-recursive
commit
|
commitdiff
|
tree
|
snapshot
2010-09-18
Junio C Hamano
Git 1.7.3
v1.7.3
commit
|
commitdiff
|
tree
|
snapshot
2010-09-18
Junio C Hamano
Merge branch 'js/ls-files-x-doc'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-17
Chris Johnsen
git-rebase--interactive.sh: replace cut with ${v%% *}
commit
|
commitdiff
|
tree
|
snapshot
2010-09-17
Brandon Casey
t/t7300: workaround ancient touch by rearranging arguments
commit
|
commitdiff
|
tree
|
snapshot
2010-09-16
Junio C Hamano
Merge branch 'bg/fix-t7003'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-16
Junio C Hamano
ls-files documentation: reword for consistency
commit
|
commitdiff
|
tree
|
snapshot
2010-09-16
Jay Soffian
git-ls-files.txt: clarify -x/--exclude option
commit
|
commitdiff
|
tree
|
snapshot
2010-09-15
Junio C Hamano
Git 1.7.3 rc2
v1.7.3-rc2
commit
|
commitdiff
|
tree
|
snapshot
2010-09-15
Junio C Hamano
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-15
Junio C Hamano
Merge branch 'os/fix-rebase-diff-no-prefix'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-15
Junio C Hamano
Merge branch 'jl/fix-test'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-15
Junio C Hamano
Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-15
Junio C Hamano
Merge branch 'ch/maint-cannot-create-bundle-error'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-15
Junio C Hamano
Merge branch 'ks/recursive-rename-add-identical'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
commit
|
commitdiff
|
tree
|
snapshot
2010-09-14
Pat Thoyts
git-gui 0.13
gitgui-0.13.0
commit
|
commitdiff
|
tree
|
snapshot
2010-09-13
Pat Thoyts
git-gui: avoid mis-encoding the copyright message on...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-13
Peter Krefting
git-gui: Update Swedish translation (521t).
commit
|
commitdiff
|
tree
|
snapshot
2010-09-13
Brian Gernhardt
t7003: Use test_commit instead of custom function
commit
|
commitdiff
|
tree
|
snapshot
2010-09-12
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-12
Junio C Hamano
ls-tree $di $dir: do not mistakenly recurse into direct...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-12
Junio C Hamano
t3101: modernise style
commit
|
commitdiff
|
tree
|
snapshot
2010-09-12
Ramsay Jones
vcs-svn: Fix some printf format compiler warnings
commit
|
commitdiff
|
tree
|
snapshot
2010-09-11
René Scharfe
compat/nedmalloc: don't force NDEBUG on the rest of git
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Junio C Hamano
Git 1.7.3 rc1
v1.7.3-rc1
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Junio C Hamano
Merge branch 'np/relnotes-in-subdir'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Junio C Hamano
Prepare for 1.7.3 rc1
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Mark Lodato
config.txt: fix placement of diff.noprefix
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Brandon Casey
t/t4018: avoid two unnecessary sub-shell invocations
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Brandon Casey
t/t4018: test whether the word_regex patterns compile
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Brandon Casey
xdiff-interface.c: always trim trailing space from...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Brandon Casey
diff.c: call regfree to free memory allocated by regcom...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Brandon Casey
t/t5510-fetch.sh: improve testing with explicit URL...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Brandon Casey
builtin/fetch.c: comment that branch->remote_name is...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Brandon Casey
Makefile: use compat regex on IRIX 6.5
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Brandon Casey
t/t7008: workaround broken handling of \000 by printf...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Oded Shimon
Add --src/dst-prefix to git-formt-patch in git-rebase.sh
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Elijah Newren
merge-recursive: D/F conflicts where was_a_dir/file...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-10
Elijah Newren
t3509: Add rename + D/F conflict testcase that recursiv...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-09
Junio C Hamano
install-webdoc: keep installed RelNotes-*.txt
commit
|
commitdiff
|
tree
|
snapshot
2010-09-09
Jens Lehmann
t1020: Get rid of 'cd "$HERE"' at the start of each...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-09
Jonathan Nieder
t2016 (checkout -p): add missing &&
commit
|
commitdiff
|
tree
|
snapshot
2010-09-09
Jonathan Nieder
t1302 (core.repositoryversion): style tweaks
commit
|
commitdiff
|
tree
|
snapshot
2010-09-09
Jonathan Nieder
t2105 (gitfile): add missing &&
commit
|
commitdiff
|
tree
|
snapshot
2010-09-09
Jonathan Nieder
t1450 (fsck): remove dangling objects
commit
|
commitdiff
|
tree
|
snapshot
2010-09-09
Jonathan Nieder
tests: subshell indentation stylefix
commit
|
commitdiff
|
tree
|
snapshot
2010-09-08
Junio C Hamano
Merge branch 'tf/cleanup-builtin-help-headers'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-08
Junio C Hamano
Merge branch 'jk/test-must-fail-missing'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-08
Junio C Hamano
Merge branch 'jh/error-removing-missing-note'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-08
Junio C Hamano
Merge branch 'kf/askpass-config'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-08
Junio C Hamano
Merge branch 'bc/maint-fetch-url-only'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-08
Junio C Hamano
Merge branch 'jk/maint-pass-c-config-in-env'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-08
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-08
Johannes Sixt
fast-export: ensure that a renamed file is printed...
commit
|
commitdiff
|
tree
|
snapshot
2010-09-07
Nicolas Pitre
Documentation: move RelNotes into a directory of their own
commit
|
commitdiff
|
tree
|
snapshot
2010-09-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
|
snapshot
2010-09-07
Elijah Newren
revert: Fix trivial comment style issue
commit
|
commitdiff
|
tree
|
snapshot
2010-09-07
Elijah Newren
cache_tree_free: Fix small memory leak
commit
|
commitdiff
|
tree
|
snapshot
next