?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge branch 'maint' to sync with Git 1.7.3.3
2010-10-13 Bert WesargDocumentation: update-index: -z applies also to --index...
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2010-05-20 Bert Wesargdiff: fix coloring of extended diff headers
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2010-03-07 Bert Wesargunset GREP_OPTIONS in test-lib.sh
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2010-03-03 Bert Wesargmerge-file: add option to select union merge favor
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2010-03-03 Bert Wesargmerge-file: add option to specify the marker size
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2010-03-02 Bert Wesargrefactor merge flags into xmparam_t
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2010-03-02 Bert Wesargmake union merge an xdl merge favor
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2010-02-23 Bert Wesargrerere: fix memory leak if rerere images can't be read
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2010-02-23 Bert WesargDocumentation: mention conflict marker size argument...
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2009-12-01 Bert Wesargget_ref_states: strdup entries and free util in stale...
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2009-11-28 Bert WesargGive the hunk comment its own color
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2009-09-07 Bert Wesarggithooks.txt: put hooks into subsections
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2009-06-23 Bert Wesargbuiltin-remote: (get_one_entry): use strbuf
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2009-04-13 Bert Wesargrev-parse: --abbrev-ref option to shorten ref name
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2009-04-13 Bert Wesargfor-each-ref: utilize core.warnAmbiguousRefs for :short...
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2009-04-13 Bert Wesargshorten_unambiguous_ref(): add strict mode
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
2008-09-06 Bert Wesargfor-each-ref: `:short` format for `refname`
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
 commit | commitdiff | tree
git with Jakub Narębski modifications