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 'ap/merge-backend-opts'
Junio C Hamano
2010-01-20
|
\
|
*
Extend merge-subtree tests to test -Xsubtree=dir.
Avery Pennarun
2010-01-17
|
*
Teach git-pull to pass -X<option> to git-merge
Avery Pennarun
2010-01-17
|
*
git merge -X<option>
Avery Pennarun
2010-01-17
*
|
Merge branch 'jh/notes' (early part)
Junio C Hamano
2010-01-20
|
\
\
|
*
|
Add more testcases to test fast-import of notes
Johan Herland
2009-12-07
|
*
|
Rename t9301 to t9350, to make room for more fast-import tests
Johan Herland
2009-12-07
|
*
|
fast-import: Proper notes tree manipulation
Johan Herland
2009-12-07
*
|
|
Merge branch 'jc/cache-unmerge'
Junio C Hamano
2010-01-20
|
\
\
\
|
*
|
|
rerere forget path: forget recorded resolution
Junio C Hamano
2010-01-10
|
*
|
|
resolve-undo: teach "update-index --unresolve" to use resolve-undo info
Junio C Hamano
2009-12-25
|
*
|
|
resolve-undo: "checkout -m path" uses resolve-undo information
Junio C Hamano
2009-12-25
|
*
|
|
resolve-undo: allow plumbing to clear the information
Junio C Hamano
2009-12-25
|
*
|
|
resolve-undo: basic tests
Junio C Hamano
2009-12-25
*
|
|
|
Merge branch 'js/exec-error-report'
Junio C Hamano
2010-01-20
|
\
\
\
\
|
*
|
|
|
start_command: detect execvp failures early
Johannes Sixt
2010-01-10
|
*
|
|
|
Merge branch 'master' into il/vcs-helper
Junio C Hamano
2009-12-06
|
|
\
\
\
\
*
|
\
\
\
\
Merge branch 'jc/ls-files-ignored-pathspec'
Junio C Hamano
2010-01-20
|
\
\
\
\
\
\
|
*
|
|
|
|
|
ls-files: fix overeager pathspec optimization
Junio C Hamano
2010-01-08
|
*
|
|
|
|
|
t3001: test ls-files -o ignored/dir
Junio C Hamano
2010-01-08
*
|
|
|
|
|
|
Merge branch 'jc/grep-lookahead'
Junio C Hamano
2010-01-20
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
grep --no-index: allow use of "git grep" outside a git repository
Junio C Hamano
2010-01-15
|
*
|
|
|
|
|
|
grep: rip out support for external grep
Junio C Hamano
2010-01-13
|
|
|
_
|
_
|
/
/
/
|
|
/
|
|
|
|
|
*
|
|
|
|
|
|
Merge branch 'mm/conflict-advice'
Junio C Hamano
2010-01-20
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
Be more user-friendly when refusing to do something because of conflict.
Matthieu Moy
2010-01-12
|
|
/
/
/
/
/
/
*
|
|
|
|
|
|
Merge branch 'da/difftool'
Junio C Hamano
2010-01-20
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
difftool: Update copyright notices to list each year separately
David Aguilar
2010-01-15
|
*
|
|
|
|
|
|
difftool: Use eval to expand '--extcmd' expressions
David Aguilar
2010-01-15
|
*
|
|
|
|
|
|
difftool: Add '-x' and as an alias for '--extcmd'
David Aguilar
2010-01-15
|
*
|
|
|
|
|
|
t7800-difftool.sh: Simplify the --extcmd test
David Aguilar
2010-01-15
|
*
|
|
|
|
|
|
difftool: Allow specifying unconfigured commands with --extcmd
David Aguilar
2010-01-09
|
*
|
|
|
|
|
|
difftool--helper: Remove use of the GIT_MERGE_TOOL variable
David Aguilar
2010-01-09
|
*
|
|
|
|
|
|
git-difftool: Add '--gui' for selecting a GUI tool
David Aguilar
2010-01-03
|
*
|
|
|
|
|
|
t7800-difftool: Set a bogus tool for use by tests
David Aguilar
2010-01-03
|
|
/
/
/
/
/
/
*
|
|
|
|
|
|
Merge branch 'mh/rebase-fixup'
Junio C Hamano
2010-01-20
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
rebase -i: Retain user-edited commit messages after squash/fixup conflicts
Michael Haggerty
2010-01-14
|
*
|
|
|
|
|
|
t3404: Set up more of the test repo in the "setup" step
Michael Haggerty
2010-01-14
|
*
|
|
|
|
|
|
rebase -i: For fixup commands without squashes, do not start editor
Michael Haggerty
2010-01-14
|
*
|
|
|
|
|
|
rebase -i: Improve consistency of commit count in generated commit messages
Michael Haggerty
2010-01-14
|
*
|
|
|
|
|
|
t3404: Test the commit count in commit messages generated by "rebase -i"
Michael Haggerty
2010-01-14
*
|
|
|
|
|
|
|
Merge branch 'ns/rebase-auto-squash'
Junio C Hamano
2010-01-20
|
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
rebase -i --autosquash: auto-squash commits
Nanako Shiraishi
2010-01-06
*
|
|
|
|
|
|
|
|
Merge branch 'mh/rebase-fixup' (early part)
Junio C Hamano
2010-01-20
|
\
\
\
\
\
\
\
\
\
|
|
|
/
/
/
/
/
/
/
|
|
/
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
rebase-i: Ignore comments and blank lines in peek_next_command
Michael Haggerty
2010-01-12
|
*
|
|
|
|
|
|
|
lib-rebase: Allow comments and blank lines to be added to the rebase script
Michael Haggerty
2010-01-12
|
*
|
|
|
|
|
|
|
lib-rebase: Provide clearer debugging info about what the editor did
Michael Haggerty
2010-01-12
|
|
/
/
/
/
/
/
/
|
*
|
|
|
|
|
|
Add a command "fixup" to rebase --interactive
Michael Haggerty
2009-12-07
|
*
|
|
|
|
|
|
t3404: Use test_commit to set up test repository
Michael Haggerty
2009-12-06
*
|
|
|
|
|
|
|
Merge branch 'il/push-set-upstream'
Junio C Hamano
2010-01-20
|
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
Add push --set-upstream
Ilari Liusvaara
2010-01-16
[next]
