repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mz/doc-rebase-abort' into maint
2011-07-12
Bert
W
esarg
Documentation: clearly specify wha
t
refs are
h
onored
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
Bert Wesarg
git-gui: handle
meta diff h
e
ader lines o
n
ly in th
e
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
B
e
r
t
Wesarg
git-gui: ha
n
d
le s
p
ecial
c
onten
t
line
s
only in the d
i
ff
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
Bert Wes
a
rg
gi
t
-g
u
i: alway
s
reset the current
tag
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
Be
r
t Wesarg
git-gui:
m
o
ve 3way d
i
f
f autodetect up
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
Bert
W
e
sarg
git
-
gui: th
e
re is no "mode *" diff header line
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
Ber
t
Wesarg
git
-
gui: name a
l
so new sym
l
inks so
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
Ber
t
Wesarg
git-g
u
i
:
han
d
le inde
x
l
i
n
e
s o
n
ly in th
e
diff he
a
der
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
Bert Wesa
r
g
git-gui
:
rework ha
n
dling o
f
di
f
f header
Reported-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
Bert Wesarg
git-gui: learn more type change s
t
a
t
e
s
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
Ber
t
Wesarg
git-g
u
i
:
remo
v
e 'no such
v
a
r
i
a
b
le'
f
or s
error
w
h
en
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2011-01-28
B
ert We
s
a
r
g
git-gui: fix typo in image d
a
ta
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-12-06
B
ert Wesarg
git-gui: Fix use of hunk tag
f
or non-hunk content
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-12-06
Bert We
s
arg
git-gui: Fix use of rename
d
tag
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-11-22
B
e
rt Wesarg
git-gui: fix browsers [
U
p To Parent] in su
b
-sub-direct
o
ries
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-11-19
Bert Wesarg
git-gui: respe
c
t co
n
flict ma
r
ker siz
e
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-11-19
Bert Wesarg
git-gui: fix
ANSI
-
color parsi
n
g
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-10-13
Bert Wesar
g
Docum
e
n
tation: update
-
index: -z
a
pp
l
ies als
o
to --index
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-05-20
Bert
W
e
sa
r
g
diff: fix c
o
lor
i
ng of
extended dif
f
headers
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-07
Bert
W
e
sarg
unset
GRE
P
_
O
PTIONS in test-lib
.
sh
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert We
s
arg
merge-file
:
a
d
d
o
p
tion to select unio
n
merge favo
r
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-03
Ber
t
Wesarg
m
e
rg
e
-f
i
l
e
: add option
to s
p
ecify the m
a
rk
e
r s
i
ze
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Ber
t
Wesar
g
refact
o
r me
r
ge flags into xmpara
m
_t
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wes
a
r
g
make union merg
e
an x
d
l mer
g
e fav
o
r
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Be
r
t Wesarg
rerere: fix memor
y
leak if rerere
i
ma
g
es can't be re
a
d
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2010-02-23
Bert
Wesa
r
g
Docu
m
e
ntat
i
on: mentio
n
conflict marker size
a
rgument
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-12-01
Bert
W
e
s
arg
get
_
ref_states: strdup ent
r
ies a
n
d free util in stale
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-11-28
Bert
W
esarg
G
ive the hunk comment its own color
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-09-07
Bert Wesarg
gi
t
hoo
k
s
.
t
xt:
pu
t
ho
o
ks in
t
o
s
ubsections
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-06-23
Bert Wesarg
bu
i
ltin-remote: (get_one
_
e
n
try): use st
r
buf
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesa
r
g
rev-parse:
--abbrev-ref option to shorten ref name
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
B
e
rt Wesa
r
g
for-each-
r
ef: utilize core
.
warnA
m
biguousRefs
for :short
.
.
.
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2009-04-13
Bert Wesarg
shorten_una
m
b
i
g
uous_ref():
a
d
d
strict mode
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree
2008-09-06
B
ert
W
esarg
for-eac
h
-ref: `:short` format for `
r
efname`
Signed-off-by:
Bert Wesarg
<bert.wesarg@googlemail.com>
commit
|
commitdiff
|
tree