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
attr: plug minor memory leak
2009-06-30
M
i
klos Vajna
git-submodul
e
do
c
umentat
i
on: fix
foreach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
M
i
klos Vajna
git-s
v
n
d
o
c
umentation: fix typo i
n
'rebase
vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos
V
ajna
refs: use wa
r
ning() in
s
tead
of fprint
f
(stderr
,
"warning:
"
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
built
i
n
-show-re
f
: u
s
e
w
a
rning() instead
o
f fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajn
a
bui
l
tin-sh
o
w
-bra
n
ch: use warning() i
n
s
t
e
a
d
of
fpri
n
tf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
builtin-rm: use w
a
rning() in
s
tead of fprintf(s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
bui
l
tin
-
init-d
b
: use
warnin
g
() instead of fprintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
buil
t
in-
f
e
tch-pack:
u
se
warni
n
g
(
) instead o
f
fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s
Vajna
b
u
i
lt
i
n
-
c
hecko
u
t:
use warning() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bu
i
ltin-apply: u
s
e
war
n
ing() instea
d
of fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vaj
n
a
h
ttp-push: using
err
o
r() and warnin
g
(
)
a
s appr
o
priate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Tests: use test_cmp instead of d
i
ff where possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos V
a
jna
parse-opt: migr
a
te builtin-ls-f
i
les
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gi
t
tutorial: r
e
move m
i
s
l
eading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos V
a
jn
a
Make t3
4
11 e
x
ecu
t
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos
Va
j
na
f
a
s
t
-
ex
p
ort: print usage when no options
specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Mik
l
o
s Va
j
na
parse-opt:
m
i
gra
t
e
b
u
iltin-ap
p
l
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklo
s
V
aj
n
a
t9129: skip the
last
three tests if UTF-8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
M
iklos Vajna
Sub
m
ittingPa
t
ches: mention
the u
s
age of real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks documentation:
add a
n
ote about
the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
Vaj
n
a
git-dae
m
on documentat
i
on: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos
Vaj
n
a
Add support for a
p
df version of the user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
git-gui
:
Update Hu
n
garian
tran
s
lation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
ht
t
p
.
c: u
s
e 'git_config
_
st
r
ing
'
to get
'
curl_http
_
pro
x
y'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
na
subm
o
du
l
e
:
use gi
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
rebase
:
use
g
i
t
rev-parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajna
pull: us
e
git rev-parse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajn
a
lost-found: use gi
t
rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
f
i
lter-
b
ranc
h
:
u
se
git rev-pa
r
se -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stash
:
us
e
g
it rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User's Manual: remo
v
e duplicate
d
url at the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
iklos
Vajna
bui
l
tin_clone:
u
se strbuf in cmd_c
l
one()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mikl
o
s
V
a
j
n
a
builtin-clone
:
use strbuf in cl
o
ne_loc
a
l() and copy_or_l
i
nk_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
Vajna
buil
t
i
n-clone:
u
se strbuf in gues
s
_
d
ir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Va
j
n
a
Add
n
ew t
e
stcase
t
o show fast-
e
xport d
o
e
s
not al
w
ays
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajn
a
builtin-bran
c
h
: use strbuf in rename
_
br
a
n
ch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos
Vajna
b
uiltin-branch: use s
t
rbuf in fill_
t
racking_i
n
fo()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos Vajna
b
uiltin-br
a
nch:
u
s
e
s
trbuf in delete
_
branc
h
es()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Upda
t
e Hun
g
arian
translation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-rem
o
te: document the migrati
o
n
f
ea
t
u
r
e
of t
h
e ren
a
me
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos V
a
jna
git-rem
o
te rename: migrate
from remotes/
and
branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
r
e
m
ote:
add a new 'origin'
v
aria
b
l
e
to the
s
truct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos
Vajna
Implem
e
nt git
remo
t
e rena
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vaj
n
a
u
p
d
a
te
-
r
e
f
--
n
o-deref -d: hand
l
e the
case when
t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mikl
o
s Va
j
n
a
git
bra
n
c
h
-m
:
forbid renaming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
ik
l
o
s
Vajna
Fix
g
i
t update-ref --
n
o-der
e
f -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
a
j
na
renam
e
_ref()
:
hand
l
e the
case when th
e
refl
o
g
o
f
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
Fix git branch -m for symr
e
fs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
par
s
e
-
opt: migr
a
te builtin-checkout-ind
e
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s V
a
jna
Add testcase to ensur
e
merging
a
n ear
l
y p
a
r
t of
a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
klos Vajna
A
d
d
L
inux P
P
C s
u
pport to
t
he pre-auto-g
c
example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mikl
o
s Vajna
test-l
i
b:
f
ix col
o
r reset
i
n say_
c
olor(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
kl
o
s Vajna
Implemen
t
git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos Vajna
Cle
a
nup in
s
ha1_file
.
c::cach
e
_or_u
n
pack_e
n
try()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mik
l
os
Vajna
bui
l
tin-commit: use reduce
_
h
e
ads(
)
only
w
hen ap
p
ropr
i
ate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-merge:
r
efresh the
index b
e
fore
call
i
ng a
st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: a
d
d
n
e
w testcase
s
t
o
ensure bu
i
ltin-co
m
mit
uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-c
o
mmit
:
u
s
e c
o
mmit_tr
e
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
a
j
n
a
comm
i
t_tree(): ad
d
a
new autho
r
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Va
j
na
t7501: always
u
se
t
est_c
m
p inst
e
ad of dif
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
b
u
i
ltin-merge: release
t
he lo
c
kfil
e
in
t
ry_merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vaj
n
a
merge-re
c
ursi
v
e:
get ri
d
of virtu
a
l_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
m
erg
e
-recur
s
ive
:
move current_{file,director
y
}
_
set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vaj
n
a
merge-recurs
i
ve
:
move the
global
o
buf to s
t
ruct
m
er
g
e_opt
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
m
e
rge-recursive: get
rid o
f
the
i
n
d
ex_on
l
y global varia
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
i
klos Vajna
merge-recursive: m
o
ve c
a
ll_depth to
struct merg
e
_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos V
a
jna
Makefile: add
m
e
r
ge_recursiv
e
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry
-
pick/revert: make
d
ir
e
ct internal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los V
a
jna
b
uiltin-me
r
ge: avo
i
d run_
c
omman
d
_v_op
t
(
) f
o
r recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
ajna
merge-recursive: introduc
e
merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
S
p
lit out m
e
rge_re
c
ursiv
e
() to merge-
r
ecursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
a
jna
Makefile: enable
SNPRINTF_RETURNS_
B
OG
U
S for
H
P-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
F
i
x
'git
h
elp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: replace
'
!' with test_must_f
a
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
D
ocumentation: document the p
a
g
e
r
.
* configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
Vajna
B
uiltin
g
i
t-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mik
l
os Vajna
builtin-help:
alw
a
ys lo
a
d_command_
l
i
st(
)
in c
m
d_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a s
e
con
d
testcase for ha
n
dling inval
i
d
strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
l
os Va
j
na
A
dd a
new t
e
st f
o
r u
s
ing a custom merg
e
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
b
u
i
l
tin-m
e
rge: allow u
s
in
g
a
cu
s
tom strat
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builti
n
-
h
elp: make some internal functions a
v
a
i
lable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos
Vaj
n
a
t
7
601:
exte
n
d the 'me
r
ge picks u
p
the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: gi
v
e
a
proper
e
rr
o
r m
e
ss
a
ge for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vajna
Teac
h
'git merge'
th
a
t some merge strategi
e
s no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
Add a
n
ew test fo
r
git-merge-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
t6021: add a new test for git-merge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
make remo
v
e-dashes: apply to sc
r
ipt
s
and progr
a
ms a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Va
j
na
git
-
bisect: use
dash-less form on git bisect
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Va
j
n
a
t
1
00
7
-hash-o
b
ject
.
sh
:
use
quotes for the test descr
i
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos
V
ajna
t0
0
01-init
.
sh: cha
n
ge confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
iklos Vajna
Buil
d
in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
V
ajna
Fix
t
7
6
01-merg
e
-p
u
ll-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
gi
t
-co
m
m
i
t-tree: make it u
s
a
ble fro
m
other built
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Add ne
w
test case
t
o ensu
r
e g
i
t-merge prepends
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-
t
o-git: use
g
it init instead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-g
i
t: rew
r
ite "git-frotz
"
t
o "git frotz
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
h
g
-
to-git:
a
bort if
th
e
proj
e
c
t
di
r
ecto
r
y is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
lo
s
V
a
j
n
a
h
g
-
t
o-git:
a
v
oid
r
aisi
n
g a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
I
N
STALL: Update section
a
b
o
u
t g
i
t
-
frotz fo
r
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mi
k
los Vajna
Retire
'
stupid' merge strate
g
y
commit
|
commitdiff
|
tree
next