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 branch 'bc/master-diff-hunk-header-fix'
Shawn O. Pearce
2008-09-29
|
\
|
*
Merge branch 'maint' into bc/master-diff-hunk-header-fix
Shawn O. Pearce
2008-09-29
|
|
\
|
|
*
Merge branch 'bc/maint-diff-hunk-header-fix' into maint
Shawn O. Pearce
2008-09-29
|
|
|
\
|
|
*
\
Merge branch 'mg/maint-remote-fix' into maint
Shawn O. Pearce
2008-09-29
|
|
|
\
\
|
|
|
*
|
make "git remote" report multiple URLs
Michael J Gruber
2008-09-22
|
|
*
|
|
Clarify commit error message for unmerged files
Rafael Garcia-Suarez
2008-09-29
|
|
*
|
|
Use strchrnul() instead of strchr() plus manual workaround
Johan Herland
2008-09-29
|
|
*
|
|
Use remove_path from dir.c instead of own implementation
Alex Riesen
2008-09-29
|
|
*
|
|
Add remove_path: a function to remove as much as possible of a path
Alex Riesen
2008-09-29
|
|
*
|
|
git-submodule: Fix "Unable to checkout" for the initial 'update'
Ping Yin
2008-09-29
|
|
*
|
|
Clarify how the user can satisfy stash's 'dirty state' check.
Stephen Haberman
2008-09-29
|
*
|
|
|
t4018-diff-funcname: test syntax of builtin xfuncname patterns
Brandon Casey
2008-09-23
|
*
|
|
|
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
Junio C Hamano
2008-09-22
|
|
\
\
\
\
|
|
|
|
_
|
/
|
|
|
/
|
|
|
|
*
|
|
t4018-diff-funcname: test syntax of builtin xfuncname patterns
Brandon Casey
2008-09-22
|
*
|
|
|
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
Junio C Hamano
2008-09-20
|
|
\
\
\
\
|
|
|
/
/
/
|
|
*
|
|
diff hunk pattern: fix misconverted "\{" tex macro introducers
Junio C Hamano
2008-09-20
|
*
|
|
|
diff: fix "multiple regexp" semantics to find hunk header comment
Junio C Hamano
2008-09-20
|
*
|
|
|
diff: use extended regexp to find hunk headers
Junio C Hamano
2008-09-19
|
*
|
|
|
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
Junio C Hamano
2008-09-19
|
|
\
\
\
\
|
|
|
/
/
/
|
|
*
|
|
diff: use extended regexp to find hunk headers
Junio C Hamano
2008-09-19
|
*
|
|
|
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
Junio C Hamano
2008-09-18
|
|
\
\
\
\
|
|
|
/
/
/
|
|
*
|
|
diff.*.xfuncname which uses "extended" regex's for hunk header selection
Brandon Casey
2008-09-18
|
|
*
|
|
diff.c: associate a flag with each pattern and use it for compiling regex
Brandon Casey
2008-09-18
|
|
*
|
|
diff.c: return pattern entry pointer rather than just the hunk header pattern
Brandon Casey
2008-09-18
|
|
|
|
/
|
|
|
/
|
*
|
|
|
Merge branch 'jc/better-conflict-resolution'
Shawn O. Pearce
2008-09-29
|
\
\
\
\
|
*
|
|
|
Fix AsciiDoc errors in merge documentation
Johan Herland
2008-09-04
|
*
|
|
|
git-merge documentation: describe how conflict is presented
Junio C Hamano
2008-08-31
|
*
|
|
|
checkout --conflict=<style>: recreate merge in a non-default style
Junio C Hamano
2008-08-31
|
*
|
|
|
checkout -m: recreate merge when checking out of unmerged index
Junio C Hamano
2008-08-30
|
*
|
|
|
Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'
Junio C Hamano
2008-08-30
|
|
\
\
\
\
|
|
*
|
|
|
checkout --ours/--theirs: allow checking out one side of a conflicting merge
Junio C Hamano
2008-08-30
|
|
*
|
|
|
checkout -f: allow ignoring unmerged paths when checking out of the index
Junio C Hamano
2008-08-30
|
*
|
|
|
|
git-merge-recursive: learn to honor merge.conflictstyle
Junio C Hamano
2008-08-30
|
*
|
|
|
|
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
Junio C Hamano
2008-08-30
|
*
|
|
|
|
rerere: understand "diff3 -m" style conflicts with the original
Junio C Hamano
2008-08-30
|
*
|
|
|
|
rerere.c: use symbolic constants to keep track of parsing states
Junio C Hamano
2008-08-30
|
*
|
|
|
|
xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
Junio C Hamano
2008-08-30
|
*
|
|
|
|
xmerge.c: minimum readability fixups
Junio C Hamano
2008-08-30
|
*
|
|
|
|
xdiff-merge: optionally show conflicts in "diff3 -m" style
Junio C Hamano
2008-08-30
|
*
|
|
|
|
xdl_fill_merge_buffer(): separate out a too deeply nested function
Junio C Hamano
2008-08-30
*
|
|
|
|
|
Add contrib/rerere-train script
Nanako Shiraishi
2008-09-29
*
|
|
|
|
|
mingw: remove use of _getdrive() from lstat/fstat
Dmitry Potapov
2008-09-29
*
|
|
|
|
|
compat/mingw: Support a timeout in the poll emulation if no fds are given
Johannes Sixt
2008-09-29
*
|
|
|
|
|
usage.c: remove unused functions
Nanako Shiraishi
2008-09-29
*
|
|
|
|
|
Merge branch 'maint'
Shawn O. Pearce
2008-09-26
|
\
\
\
\
\
\
|
|
|
_
|
_
|
_
|
/
|
|
/
|
|
|
|
|
*
|
|
|
|
Remove empty directories in recursive merge
Alex Riesen
2008-09-26
|
*
|
|
|
|
Documentation: clarify the details of overriding LESS via core.pager
Chris Frey
2008-09-26
*
|
|
|
|
|
Cleanup remove_path
Alex Riesen
2008-09-26
*
|
|
|
|
|
Merge branch 'mv/merge-recursive'
Shawn O. Pearce
2008-09-25
|
\
\
\
\
\
\
|
*
|
|
|
|
|
builtin-merge: release the lockfile in try_merge_strategy()
Miklos Vajna
2008-09-06
[next]