repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tr/maint-merge-file-subdir' into maint
2010-10-13
Bert We
s
arg
Document
a
t
i
on: updat
e
-index:
-z applies al
s
o to -
-
ind
e
x
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-05-20
B
ert Wesarg
diff: fix coloring of extended diff head
e
r
s
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
B
ert W
e
s
arg
unset
G
REP
_
OPTIO
N
S in test-li
b
.
s
h
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merge-f
i
le: add
o
p
tion to select
u
nion
m
e
rge favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
B
e
rt W
e
sa
r
g
merge-file: add op
t
i
on
t
o specify th
e
m
arker s
i
z
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert We
s
arg
refactor merge flags into x
m
par
a
m_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
make union merge a
n
xdl merge favor
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
B
e
rt
W
esarg
re
r
e
re: fix memory le
a
k if rer
e
re images can't be
r
ead
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert
Wesarg
Documentat
i
on: mention
conflict
m
a
rker size ar
g
u
ment
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
B
e
rt Wesarg
get_ref_
s
tate
s
:
str
d
up entries an
d
free util in st
a
le
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Bert Wesarg
Give the hu
n
k c
o
mment i
t
s own color
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert W
e
sarg
gi
t
hooks
.
txt:
p
ut hooks into subs
e
cti
o
ns
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Be
r
t Wesarg
builtin-remote: (get_one_entry)
:
use strbuf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Ber
t
Wesar
g
rev-pars
e
: --abbrev
-
ref option to shorten
ref name
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
B
ert
W
e
sarg
for
-
each-
r
ef: utilize
c
ore
.
w
a
rnAm
b
ig
u
ousRef
s
for :shor
t
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesar
g
shorten_
u
n
a
m
biguou
s
_r
e
f(): add
stric
t
mo
d
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
Bert Wesarg
for-each-ref: `:short`
f
orma
t
f
or
`refname`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree