index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
Commit message (
Expand
)
Author
Age
*
Merge branch 'en/merge-recursive'
Junio C Hamano
2010-11-29
|
\
|
*
t6022: Use -eq not = to test output of wc -l
Brian Gernhardt
2010-11-17
|
*
merge-recursive: Make room for directories in D/F conflicts
Elijah Newren
2010-09-29
|
*
handle_delete_modify(): Check whether D/F conflicts are still present
Elijah Newren
2010-09-29
|
*
merge_content(): Check whether D/F conflicts are still present
Elijah Newren
2010-09-29
|
*
conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
Elijah Newren
2010-09-29
|
*
conflict_rename_delete(): Check whether D/F conflicts are still present
Elijah Newren
2010-09-29
|
*
merge-recursive: Delay content merging for renames
Elijah Newren
2010-09-29
|
*
merge-recursive: Move handling of double rename of one file to two
Elijah Newren
2010-09-29
|
*
merge-recursive: Avoid doubly merging rename/add conflict contents
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
|
*
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
*
|
|
Merge branch 'jn/cherry-pick-refresh-index'
Junio C Hamano
2010-11-29
|
\
\
\
|
*
|
|
cherry-pick/revert: transparently refresh index
Jonathan Nieder
2010-11-10
*
|
|
|
Merge branch 'fc/apply-p2-get-header-name'
Junio C Hamano
2010-11-29
|
\
\
\
\
|
*
|
|
|
test: git-apply -p2 rename/chmod only
Junio C Hamano
2010-11-05
|
|
/
/
/
*
|
|
|
Merge branch 'jn/fast-import-fix'
Junio C Hamano
2010-11-29
|
\
\
\
\
|
*
|
|
|
t9300 (fast-import): another test for the "replace root" feature
Jonathan Nieder
2010-10-19
|
*
|
|
|
fast-import: tighten M 040000 syntax
Jonathan Nieder
2010-10-18
|
*
|
|
|
fast-import: filemodify after M 040000 <tree> "" crashes
Jonathan Nieder
2010-10-18
*
|
|
|
|
Merge branch 'kb/blame-author-email'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
|
*
|
|
|
|
blame: Add option to show author email instead of name
Kevin Ballard
2010-10-19
*
|
|
|
|
|
Merge branch 'cm/diff-check-at-eol'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
\
|
*
|
|
|
|
|
diff --check: correct line numbers of new blank lines at EOF
Christoph Mallon
2010-10-16
*
|
|
|
|
|
|
Merge branch 'ak/apply-non-git-epoch'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
apply: handle patches with funny filename and colon in timezone
Jonathan Nieder
2010-11-10
|
*
|
|
|
|
|
|
apply: Recognize epoch timestamps with : in the timezone
Anders Kaseorg
2010-10-13
|
|
|
_
|
_
|
_
|
/
/
|
|
/
|
|
|
|
|
*
|
|
|
|
|
|
Merge branch 'tc/smart-http-post-redirect'
Junio C Hamano
2010-11-29
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
smart-http: Don't change POST to GET when following redirect
Tay Ray Chuan
2010-09-27
*
|
|
|
|
|
|
|
Merge branch 'en/and-cascade-tests'
Junio C Hamano
2010-11-26
|
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
t7300: add a missing SYMLINKS prerequisite
Johannes Sixt
2010-11-26
*
|
|
|
|
|
|
|
|
Merge branch 'cb/maint-orphan-merge-noclobber'
Junio C Hamano
2010-11-24
|
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
do not overwrite untracked during merge from unborn branch
Clemens Buchacher
2010-11-15
*
|
|
|
|
|
|
|
|
|
Merge branch 'ao/send-email-irt'
Junio C Hamano
2010-11-24
|
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
git-send-email.perl: make initial In-Reply-To apply only to first email
Antonio Ospite
2010-11-12
|
*
|
|
|
|
|
|
|
|
|
t9001: send-email interation with --in-reply-to and --chain-reply-to
Junio C Hamano
2010-11-05
*
|
|
|
|
|
|
|
|
|
|
Merge branch 'kb/maint-rebase-autosquash'
Junio C Hamano
2010-11-24
|
\
\
\
\
\
\
\
\
\
\
\
[next]
