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_trees(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-03-20
*
merge_file(): add comment explaining behavior wrt conflict style
Jonathan Nieder
2010-03-20
*
checkout --conflict=diff3: add a label for ancestor
Jonathan Nieder
2010-03-20
*
ll_merge(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-03-20
*
merge-file --diff3: add a label for ancestor
Jonathan Nieder
2010-03-20
*
xdl_merge(): move file1 and file2 labels to xmparam structure
Jonathan Nieder
2010-03-20
*
xdl_merge(): add optional ancestor label to diff3-style output
Jonathan Nieder
2010-03-20
*
tests: document cherry-pick behavior in face of conflicts
Jonathan Nieder
2010-03-20
*
tests: document format of conflicts from checkout -m
Jonathan Nieder
2010-03-20
*
Update draft release notes to 1.7.1
Junio C Hamano
2010-03-20
*
Merge branch 'jk/maint-add-ignored-dir'
Junio C Hamano
2010-03-20
|
\
|
*
tests for "git add ignored-dir/file" without -f
Junio C Hamano
2010-03-13
|
*
dir: fix COLLECT_IGNORED on excluded prefixes
Jeff King
2010-03-13
|
*
t0050: mark non-working test as such
Junio C Hamano
2010-03-13
*
|
Merge branch 'ml/color-grep'
Junio C Hamano
2010-03-20
|
\
\
|
*
|
grep: Colorize selected, context, and function lines
Mark Lodato
2010-03-08
|
*
|
grep: Colorize filename, line number, and separator
Mark Lodato
2010-03-08
|
*
|
Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
Mark Lodato
2010-03-07
*
|
|
Merge branch 'jc/color-attrs'
Junio C Hamano
2010-03-20
|
\
\
\
|
*
|
|
color: allow multiple attributes
Junio C Hamano
2010-03-07
*
|
|
|
Merge branch 'cc/reset-keep'
Junio C Hamano
2010-03-20
|
\
\
\
\
|
*
|
|
|
Documentation: improve description of "git reset --keep"
Junio C Hamano
2010-03-08
|
*
|
|
|
reset: disallow using --keep when there are unmerged entries
Christian Couder
2010-03-06
|
*
|
|
|
reset: disallow "reset --keep" outside a work tree
Christian Couder
2010-03-06
|
*
|
|
|
Documentation: reset: describe new "--keep" option
Christian Couder
2010-03-06
|
*
|
|
|
reset: add test cases for "--keep" option
Christian Couder
2010-01-24
|
*
|
|
|
reset: add option "--keep" to "git reset"
Christian Couder
2010-01-24
*
|
|
|
|
Merge branch 'fl/askpass'
Junio C Hamano
2010-03-20
|
\
\
\
\
\
|
*
|
|
|
|
git-core: Support retrieving passwords with GIT_ASKPASS
Frank Li
2010-03-04
|
*
|
|
|
|
git-svn: Support retrieving passwords with GIT_ASKPASS
Frank Li
2010-03-02
*
|
|
|
|
|
Merge branch 'bg/apply-fix-blank-at-eof'
Junio C Hamano
2010-03-20
|
\
\
\
\
\
\
|
*
|
|
|
|
|
t3417: Add test cases for "rebase --whitespace=fix"
Björn Gustavsson
2010-03-06
|
*
|
|
|
|
|
t4124: Add additional tests of --whitespace=fix
Björn Gustavsson
2010-03-06
|
*
|
|
|
|
|
apply: Allow blank context lines to match beyond EOF
Björn Gustavsson
2010-03-06
|
*
|
|
|
|
|
apply: Remove the quick rejection test
Björn Gustavsson
2010-03-06
|
*
|
|
|
|
|
apply: Don't unnecessarily update line lengths in the preimage
Björn Gustavsson
2010-03-06
*
|
|
|
|
|
|
Merge branch 'bw/union-merge-refactor'
Junio C Hamano
2010-03-20
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
merge-file: add option to select union merge favor
Bert Wesarg
2010-03-02
|
*
|
|
|
|
|
|
merge-file: add option to specify the marker size
Bert Wesarg
2010-03-02
|
*
|
|
|
|
|
|
refactor merge flags into xmparam_t
Bert Wesarg
2010-03-02
|
*
|
|
|
|
|
|
make union merge an xdl merge favor
Bert Wesarg
2010-03-02
|
|
/
/
/
/
/
/
*
|
|
|
|
|
|
Merge branch 'maint'
Junio C Hamano
2010-03-20
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
Update draft release notes to 1.7.0.3
Junio C Hamano
2010-03-20
|
*
|
|
|
|
|
|
fetch: Fix minor memory leak
Andreas Gruenbacher
2010-03-20
|
*
|
|
|
|
|
|
fetch: Future-proof initialization of a refspec on stack
Andreas Gruenbacher
2010-03-20
|
*
|
|
|
|
|
|
fetch: Check for a "^{}" suffix with suffixcmp()
Andreas Gruenbacher
2010-03-20
|
*
|
|
|
|
|
|
daemon: parse_host_and_port SIGSEGV if port is specified
Imre Deak
2010-03-20
|
*
|
|
|
|
|
|
Makefile: Fix CDPATH problem
Jonathan Nieder
2010-03-20
|
*
|
|
|
|
|
|
pull: replace unnecessary sed invocation
Stephen Boyd
2010-03-20
*
|
|
|
|
|
|
|
Fix a spelling mistake in a git-p4 console message
Benjamin C Meyer
2010-03-20
[next]
