repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer needed
2017-01-09
Johannes Schi
n
d
elin
sequencer (reba
s
e -i): remove CH
E
R
R
Y_PICK
_
H
E
AD when
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Johannes Schinde
l
in
sequ
e
ncer (reba
s
e -i): allow cont
i
nui
n
g wit
h
staged
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Johannes Schindelin
sequ
e
ncer (rebase -i): write an author-script file
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Joh
a
n
n
es Schin
d
eli
n
sequenc
e
r
(r
e
base
-
i): implement the
s
h
ort commands
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
J
ohannes Schi
n
d
e
l
i
n
seque
n
cer (r
e
base -i): add suppor
t
f
or the
'
fixup'
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Joha
n
nes Schinde
l
i
n
seque
n
cer (r
e
base -
i
): write the 'done' file
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Johannes Schindelin
sequencer (rebase
-
i):
learn
abo
u
t
t
he 'v
e
rbose' mode
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Johannes
S
c
hin
d
e
lin
se
q
uencer (rebase -i): i
m
plement
t
he 'exec
'
com
m
and
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Johannes Schindelin
sequencer (rebase -i): implemen
t
th
e
'edit
'
co
m
mand
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Johannes Schindelin
sequencer (rebase -
i
): implement
the 'noop' co
m
mand
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Johanne
s
Schindelin
s
equencer: support a new
a
ction: 'interactive rebase'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Johannes Schindelin
sequencer: use a hel
p
er t
o
fi
n
d the commit mes
s
age
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Joh
a
nnes
S
c
hindelin
seq
u
encer: move "
e
l
se" k
e
yword
o
nto
t
h
e
same line as
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2017-01-09
Johannes Schi
n
delin
sequ
e
ncer: avoid unnec
e
ssar
y
curly braces
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-12-22
Johannes S
c
h
indelin
m
ingw: a
d
ju
s
t
i
s_co
n
so
l
e() to work
w
i
th stdin
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-12-12
Johannes Sc
h
i
nde
l
in
min
g
w: in
t
ercept
isatty()
t
o
hand
l
e /dev/null
as
G
it
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-11-28
Joh
a
nnes Sc
h
i
ndelin
me
r
ge-re
c
urs
i
ve:
handl
e
N
ULL
i
n ad
d
_
c
acheinfo() correctly
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-11-28
J
ohannes
S
chindel
i
n
cherry-pick: demo
n
strate a segmen
t
ation fault
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-11-21
Jo
h
annes Schi
n
delin
r
e
base -i: handle core
.
commentC
h
ar=aut
o
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-11-21
Jo
h
ann
e
s S
c
hindelin
stri
p
space
:
respect reposit
o
ry conf
i
g
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-11-21
Johan
n
es Schindelin
r
ebase -i: h
i
ghli
g
ht problems with
c
ore
.
commentc
h
ar
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-11-10
J
ohannes Schindelin
t6026: ensure that long-run
n
ing script
r
eally is
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johannes Schindelin
sequencer: mark
a
l
l
e
rror
m
essages for translation
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
J
ohannes
S
chindeli
n
seque
n
cer: start e
r
ror
message
s
c
ons
i
stently with lo
w
e
r
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johannes Schindelin
sequen
c
er: quote fi
l
en
a
mes
in
e
rror
m
essag
e
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Joh
a
nnes Schin
d
elin
se
q
uencer: mark
act
i
o
n_name
(
)
f
or
translation
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johan
n
es Schindelin
se
q
uenc
e
r: re
m
o
v
e overzealous assump
t
ion in re
b
ase
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Joh
a
nnes
S
c
hi
n
del
i
n
seque
n
c
er
:
teach write_m
e
ssage() to a
p
pend
a
n optional LF
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
J
o
h
a
nnes S
c
hindelin
sequencer: refact
o
r wr
i
te_mess
a
ge() to
take
a
pointer
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
J
o
h
a
n
nes Schi
n
d
el
i
n
sequen
c
er: roll back lock file if w
r
i
t
e_mes
s
a
g
e
(
) failed
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Joh
a
nnes Schindel
i
n
sequencer: stop releasin
g
the strbuf in
w
rite_message()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johannes Schindelin
sequen
c
er: left-trim
l
ines read from the
s
c
r
ipt
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
J
oh
a
nne
s
Schindelin
seque
n
cer: su
p
port
c
l
e
a
n
ing up comm
i
t
m
ess
a
ges
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johan
n
es
Schindelin
seq
u
en
c
er: sup
p
or
t
am
e
nding commits
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johannes Sch
i
nd
e
lin
seque
n
cer: allow edit
i
ng
the commit
m
e
s
s
a
ge on
a
case
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
J
o
han
n
es Sch
i
ndelin
sequence
r
: in
t
rod
u
ce a helper to read
f
i
les written
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johannes Schindelin
sequencer: prepare for rebase -
i
's comm
i
t functionality
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Joh
a
n
n
e
s Schindelin
seq
u
encer: remember the onelines when parsing the
t
odo
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johanne
s
Schindelin
sequencer: get
r
i
d of the subcommand fie
l
d
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Joha
n
nes Schindelin
sequencer
:
avoid co
m
plet
e
ly dif
f
erent messa
g
e
s for
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johanne
s
S
chin
d
e
l
i
n
s
equencer: strip CR from the todo scrip
t
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johannes Schindeli
n
sequencer: co
m
pletely
r
evam
p
the "todo" script
p
arsin
g
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johannes Schindelin
sequencer: refactor the
c
ode to obtain a
s
h
ort commit
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
Johannes Schindelin
seque
n
cer
:
future-pr
o
o
f
read_populate_tod
o
()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-21
J
ohannes
S
chinde
l
in
sequenc
e
r: plug memo
r
y leaks for the opt
i
on va
l
ues
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-17
Joha
n
nes Sch
i
ndelin
sequ
e
nc
e
r
: future-proof
remove_sequencer
_
s
tate()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-17
Joha
n
ne
s
Schi
n
del
i
n
sequencer:
a
void un
n
ec
e
ssa
r
y indirection
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-17
Johann
e
s Schindelin
se
q
uenc
e
r: use memoi
z
ed sequ
e
n
c
er d
i
rector
y
pa
t
h
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-17
Jo
h
annes Schin
d
elin
sequence
r
:
use
stati
c
initializers for replay
_
o
p
ts
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-11
Johannes
Schinde
l
in
rese
t
: fix usage
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-07
Johannes
S
chindel
i
n
wt-
s
tatus: begin error messa
g
es with lower-case
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-07
Johann
e
s Schi
n
delin
wt
-
s
ta
t
us
:
tea
c
h has_{unst
a
ge
d
,un
c
ommi
t
t
ed}_ch
a
nges
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-07
Johanne
s
Schindelin
wt-s
t
atus: export also the
h
as_un{sta
g
ed,comm
i
tted
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-07
Johanne
s
Schindelin
w
t
-
s
tat
u
s:
m
ake
the require_cle
a
n_work_
t
ree() function
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-07
J
o
ha
n
nes Schindelin
pu
l
l: ma
k
e co
d
e more s
i
milar to
the
shell script again
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-10-07
Johannes Schin
d
el
i
n
p
ull:
d
r
op
c
o
n
fusing pref
i
x paramet
e
r of
d
ie_on_unclean_work
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-21
Johannes Sc
h
i
n
d
e
lin
regex: use
r
egexec_bu
f
()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-21
Johannes
S
c
hindelin
regex: add re
g
exec_buf() that can
w
ork on a no
n
NUL
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-21
J
o
h
a
n
nes S
c
h
indelin
regex: -G<p
a
ttern> fee
d
s a no
n
NUL-t
e
rmin
a
ted string
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-11
Joha
n
nes S
c
hindelin
git
-
g
ui: r
e
spect commit
.
gpgsign again
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-11
Johann
e
s Schindel
i
n
c
at
-
f
i
l
e: support -
-
textco
n
v/--filters in
batch
m
ode
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-11
Johannes Schindelin
cat-file --textconv/--filters
:
allow
spec
i
fyin
g
the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-11
Joh
a
nnes Schinde
l
in
cat-file:
intr
o
duc
e
the
--filters option
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
J
o
hanne
s
S
c
hi
n
d
eli
n
sequ
e
nc
e
r: ensure to rel
e
ase the lock when w
e
could
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Jo
h
annes Schindel
i
n
seque
n
cer: lib'i
f
y checkout_fast_forwa
r
d(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
J
ohanne
s
S
chindelin
sequencer:
lib'ify fast_for
w
ard_to
(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johannes
Schindelin
se
q
uencer: li
b
'ify save_opts
(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johannes
Schi
n
d
e
lin
s
e
q
u
e
ncer
:
li
b
'ify save_
t
odo()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Joh
a
n
nes Schindelin
sequencer: lib'ify
s
av
e
_hea
d
()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johannes Schindelin
sequencer: l
i
b'
i
fy
c
reate_seq_dir()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johanne
s
S
chindelin
seq
u
encer: lib'ify re
a
d
_
p
opulate_opts()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johannes Schindelin
s
e
quencer: lib'ify r
e
ad_populate_
t
o
do(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johannes Schindelin
sequence
r
: lib'i
f
y read_and
_
re
f
resh_cache()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johannes Schindelin
sequencer: li
b
'
i
fy prepa
r
e_revs(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johannes Schin
d
elin
sequen
c
er
:
lib'
i
fy walk_revs_populate_todo()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johannes Schin
d
elin
se
q
uencer: lib'
i
fy do_pick_commit()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
Johanne
s
Schindelin
s
e
q
u
encer: lib'ify
do
_
recursiv
e
_m
e
r
ge()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-09-09
J
oha
n
nes S
c
hindelin
sequencer: l
i
b'ify
w
r
i
te_
m
e
ssage()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-29
Johannes Schindelin
sequencer: do n
o
t
d
i
e
(
)
in do_
p
ick_commit()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-29
Joha
n
n
e
s
Schindelin
seq
u
encer: l
i
b'ify s
e
q
uencer_pick_
r
evisio
n
s()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-24
Johannes
S
chi
n
d
e
lin
c
a
t-
f
ile:
fix a grammo
in the
m
an page
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-19
Johannes Schindelin
Rev
e
rt
"display
H
TML in defau
l
t browser us
i
ng W
i
ndows
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-16
J
ohannes Schindelin
re
v
-
p
arse: respect co
r
e
.
h
ooksPath
i
n --git-p
a
t
h
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-16
Jo
h
annes Schindeli
n
t
/Makefile: ens
u
re
t
hat
pa
t
hs are valid on p
l
a
t
forms
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-08
Johannes
Schindelin
git
m
v: do not
keep slash in
`g
i
t mv dir non-exist
i
ng
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-04
J
o
hannes
Schind
e
lin
n
edmalloc: fix misleadi
n
g
indenta
t
ion
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-04
Johannes Sc
h
in
d
elin
t5533: make
i
t pa
s
s on case-sensiti
v
e file
s
y
stems
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-03
Jo
h
annes Schindelin
im
p
ort-t
a
rs: s
u
ppor
t
hard lin
k
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-01
Johannes Schind
e
li
n
merge-recursive: flush o
u
tpu
t
buffe
r
even when erroring out
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-01
Johannes Schindelin
m
e
rge_trees(): en
s
u
re that the callers release output
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-01
Johannes Schindelin
m
e
r
ge-recursive
:
o
ffer an
option t
o
r
etain
t
h
e
o
u
tput
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-01
Johannes
S
chindeli
n
merge-
r
e
c
ursive
:
write the c
o
m
mit title in
one go
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-08-01
J
o
hannes Sc
h
indelin
merge-recursive: flush o
u
tpu
t
buffer before
print
i
n
g
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-07-26
J
o
hannes Schindelin
a
m -
3
: use merge_re
c
urs
i
ve
(
) directly again
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-07-26
Johannes Schindelin
merg
e
-recursive: switch t
o
r
e
turning errors instead
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-07-26
Johannes Schindelin
merge-recursiv
e
:
han
d
le retur
n
values indicating er
r
ors
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-07-26
Johanne
s
Schindelin
merge-re
c
ursi
v
e
:
all
o
w write_tree_from_me
m
ory() to
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-07-26
Johannes
Schindelin
merge-recursive: avoid r
e
t
u
rning
a w
h
o
l
e
s
ale struct
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-07-26
Jo
h
annes Sch
i
ndelin
merge_recursive: a
b
ort properly
u
pon er
r
o
rs
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2016-07-26
Joha
n
nes S
c
h
in
d
e
l
in
pre
p
are
t
h
e
builtins for a li
b
ifie
d
merge_
r
ecurs
i
ve()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
next