index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
Commit message (
Expand
)
Author
Age
*
merge-recursive: Small code clarification -- variable name and comments
Elijah Newren
2010-09-29
*
t6036: Add testcase for undetected conflict
Elijah Newren
2010-09-29
*
t6036: Add a second testcase similar to the first but with content changes
Elijah Newren
2010-09-29
*
t6036: Test index and worktree state, not just that merge fails
Elijah Newren
2010-09-29
*
t6020: Add a testcase for modify/delete + directory/file conflict
Elijah Newren
2010-09-29
*
t6020: Modernize style a bit
Elijah Newren
2010-09-29
*
t6022: Add tests for rename/rename combined with D/F conflicts
Elijah Newren
2010-09-29
*
t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
Elijah Newren
2010-09-29
*
t6022: Add tests with both rename source & dest involved in D/F conflicts
Elijah Newren
2010-09-29
*
t6022: Add tests for reversing order of merges when D/F conflicts present
Elijah Newren
2010-09-29
*
t6022: Add test combinations of {content conflict?, D/F conflict remains?}
Elijah Newren
2010-09-29
*
t6032: Add a test checking for excessive output from merge
Elijah Newren
2010-09-29
*
merge-recursive: Restructure showing how to chain more process_* functions
Junio C Hamano
2010-09-29
*
t3030: Add a testcase for resolvable rename/add conflict with symlinks
Schalk, Ken
2010-09-29
*
Merge branch 'en/rename-d-f' into en/merge-recursive
Junio C Hamano
2010-09-29
|
\
|
*
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
Elijah Newren
2010-09-09
|
*
t3509: Add rename + D/F conflict testcase that recursive strategy fails
Elijah Newren
2010-09-09
*
|
Git 1.7.3
v1.7.3
Junio C Hamano
2010-09-18
*
|
Merge branch 'js/ls-files-x-doc'
Junio C Hamano
2010-09-18
|
\
\
|
*
|
ls-files documentation: reword for consistency
Junio C Hamano
2010-09-15
|
*
|
git-ls-files.txt: clarify -x/--exclude option
Jay Soffian
2010-09-15
*
|
|
git-rebase--interactive.sh: replace cut with ${v%% *}
Chris Johnsen
2010-09-17
*
|
|
t/t7300: workaround ancient touch by rearranging arguments
Brandon Casey
2010-09-17
*
|
|
Merge branch 'bg/fix-t7003'
Junio C Hamano
2010-09-16
|
\
\
\
|
*
|
|
t7003: Use test_commit instead of custom function
Brian Gernhardt
2010-09-13
*
|
|
|
Git 1.7.3 rc2
v1.7.3-rc2
Junio C Hamano
2010-09-15
*
|
|
|
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
Junio C Hamano
2010-09-15
|
\
\
\
\
|
*
|
|
|
ls-tree $di $dir: do not mistakenly recurse into directories
Junio C Hamano
2010-09-12
*
|
|
|
|
Merge branch 'os/fix-rebase-diff-no-prefix'
Junio C Hamano
2010-09-15
|
\
\
\
\
\
|
*
|
|
|
|
Add --src/dst-prefix to git-formt-patch in git-rebase.sh
Oded Shimon
2010-09-09
*
|
|
|
|
|
Merge branch 'jl/fix-test'
Junio C Hamano
2010-09-15
|
\
\
\
\
\
\
|
*
|
|
|
|
|
t1020: Get rid of 'cd "$HERE"' at the start of each test
Jens Lehmann
2010-09-09
|
*
|
|
|
|
|
t2016 (checkout -p): add missing &&
Jonathan Nieder
2010-09-09
|
*
|
|
|
|
|
t1302 (core.repositoryversion): style tweaks
Jonathan Nieder
2010-09-09
|
*
|
|
|
|
|
t2105 (gitfile): add missing &&
Jonathan Nieder
2010-09-09
|
*
|
|
|
|
|
t1450 (fsck): remove dangling objects
Jonathan Nieder
2010-09-09
|
*
|
|
|
|
|
tests: subshell indentation stylefix
Jonathan Nieder
2010-09-09
|
*
|
|
|
|
|
Merge branch 'jl/maint-fix-test'
Junio C Hamano
2010-09-06
|
|
\
\
\
\
\
\
|
|
*
|
|
|
|
|
Several tests: cd inside subshell instead of around
Jens Lehmann
2010-09-06
*
|
|
|
|
|
|
|
Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
Junio C Hamano
2010-09-15
|
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
filter-branch: retire --remap-to-ancestor
Csaba Henk
2010-08-27
*
|
|
|
|
|
|
|
|
Merge branch 'ch/maint-cannot-create-bundle-error'
Junio C Hamano
2010-09-15
|
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
bundle: detect if bundle file cannot be created
Csaba Henk
2010-08-27
*
|
|
|
|
|
|
|
|
|
Merge branch 'ks/recursive-rename-add-identical'
Junio C Hamano
2010-09-15
|
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
RE: [PATCH] Avoid rename/add conflict when contents are identical
Schalk, Ken
2010-09-03
*
|
|
|
|
|
|
|
|
|
|
Merge git://repo.or.cz/git-gui
Junio C Hamano
2010-09-15
|
\
\
\
\
\
\
\
\
\
\
\
|
|
_
|
_
|
_
|
_
|
_
|
_
|
_
|
/
/
/
|
/
|
|
|
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
|
git-gui 0.13
gitgui-0.13.0
Pat Thoyts
2010-09-14
|
*
|
|
|
|
|
|
|
|
|
git-gui: avoid mis-encoding the copyright message on Windows.
Pat Thoyts
2010-09-13
|
*
|
|
|
|
|
|
|
|
|
git-gui: Update Swedish translation (521t).
Peter Krefting
2010-09-13
|
*
|
|
|
|
|
|
|
|
|
git-gui: ensure correct application termination in git-gui--askpass
Pat Thoyts
2010-08-18
[next]
