repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t4201: Do not display weird characters on the terminal
2007-04-24
Johannes Schind
e
li
n
t42
0
1: Do not d
i
splay we
i
r
d c
h
aracters on
t
he ter
m
inal
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-04-10
J
o
hannes Schind
e
l
in
U
s
e pri
n
t_wrap
p
ed_tex
t
() in sho
r
tlo
g
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-28
J
ohannes
S
chindelin
t4118: be nice t
o
n
on-GNU sed
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-24
Johannes
S
chind
e
lin
git-revert:
R
evert reve
r
t
message t
o
old behavio
u
r
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-23
Johannes Schindeli
n
t411
8
: be nice
t
o no
n
-GNU se
d
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schind
e
lin
Provi
d
e some
t
ec
h
nical documentation for shallo
w
clones
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-20
Johannes
S
chi
n
delin
Add a HOWTO for setting
u
p
a
standalone git daemon
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-20
Joh
a
n
nes
Sch
i
ndelin
x
diff/xutils
.
c(xdl_hash_record): factor out whitespace
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-14
J
ohannes Schindelin
Do not output "G
E
N
"
w
h
en g
e
ner
a
ting perl
.
mak
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-12
Johann
e
s Schinde
l
in
git-bundle: only
die if pack would be e
m
pty, warn if
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-09
Johannes
Sc
h
indelin
git-b
u
n
d
le:
prevent ove
r
w
rit
i
ng existing bundle
s
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-09
Johann
e
s Schindelin
g
i
t
-
bundle: die if a given ref is
n
ot included in bundle
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-09
Johannes Schindeli
n
g
it-bundle:
h
andle t
h
in
p
acks
i
n subcomm
a
nd
"unb
u
ndle"
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-08
Johannes Schindelin
git-b
u
ndle:
M
a
k
e thin p
a
ck
s
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-08
Johan
n
es Schi
n
delin
git-bund
l
e:
avoid packing objec
t
s which are in the
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-07
Jo
h
annes Sch
i
n
d
e
l
in
bundle
:
f
i
x wrong check of read_header
(
)'s re
t
urn value
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-07
J
o
ha
n
n
es
Schinde
l
in
make t8001 work on Mac OS X again
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Schindelin
Be
g
in
Su
b
mi
t
ti
n
gPatches wi
t
h a check li
s
t
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Schindelin
f
o
rmat-patch: add -
-
inline option a
n
d make
-
-attach
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schindelin
c
herry-pick: Suggest a
b
et
t
er method to retain
a
uthorship
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-04
J
ohannes Schindelin
Get
r
id of the depende
n
cy to G
N
U
di
f
f in the
t
ests
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-04
Joh
a
n
ne
s
S
c
hinde
l
i
n
diff --no-index:
supp
o
rt /dev/null as filename
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-04
Johannes S
c
hind
e
li
n
diff
:
support reading a file from stdin via "-"
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schindelin
M
a
ke git-r
e
vert & git-
c
herr
y
-pick a built
i
n
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-04
Joh
a
nn
e
s S
c
h
i
n
d
elin
Document the
c
onfig variable format
.
suffix
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-03
Johannes Sc
h
indelin
bui
l
t
in-archive: use RUN
_
SE
T
UP
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-02
Jo
h
annes Schindelin
print_wrapped_text: fix output
f
or
n
egat
i
ve inde
n
t
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-01
Johan
n
e
s Sc
h
in
d
el
i
n
fetch
.
o depend
s
on
the h
e
aders, too
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-03-01
Johann
e
s Schinde
l
in
diff: make m
o
re cases imp
l
icit --no-in
d
ex
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-28
Johannes Schindelin
show_date(): rename the "relative" parameter to
"
m
o
de"
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-28
J
o
hannes Schindelin
A
ctually make print_wrapped_text
(
) useful
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-26
Johan
n
es Schindelin
diff --no-inde
x
:
al
s
o imitate the exit
statu
s
of diff(1)
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-25
Johannes S
c
hin
d
elin
Fix typo:
d
o not show name1 when
nam
e
2 f
a
ils
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-24
J
o
h
annes Schin
d
eli
n
object name:
i
n
troduc
e
'
:
/<onel
i
ne p
r
efix>'
not
a
ti
o
n
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-24
Johannes
S
ch
i
n
d
e
l
i
n
Fixup
n
o
-
progress
f
or fetch & clone
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Sc
h
indelin
git-bundle: reco
r
d
comm
i
t
summary i
n
the
prerequis
i
te
.
.
.
commit
|
commitdiff
|
tree
2007-02-23
J
o
ha
n
n
e
s Sc
h
indelin
git-bundle: f
i
x 'create --all'
commit
|
commitdiff
|
tree
2007-02-23
Joh
a
nnes S
c
hindelin
git-bundle: avoid fork() in verify_bundl
e
()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-23
Joh
a
n
nes Schindelin
git
-
bundle: assorted fixe
s
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-23
Jo
h
annes Schind
e
lin
A
dd git-bundle: m
o
ve objects and references by archive
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schi
n
delin
M
a
ke
tests independent o
f
global co
n
f
ig f
i
les
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-23
Johann
e
s Schindelin
g
i
t-diff: fix combin
e
d
d
iff
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-23
Johannes S
c
hindelin
p
r
etty-formats: a
d
d
'format:<string
>
'
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-23
Johannes
S
chind
e
l
i
n
Teach
git-diff
-
files the
new
option `--no-index
`
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-23
Jo
h
annes Schindelin
apply: make --ve
r
bos
e
a little
more usef
u
l
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-21
Johannes Schinde
l
in
Teach diff -B about colours
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-21
Johannes
S
chindelin
git grep:
u
se pager
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-20
J
o
hannes Schindelin
config
:
read
s
yst
e
m
-
wide defaults
f
rom
/
etc/
g
itconfig
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-20
Jo
h
a
n
nes Schindelin
fetch & clone: d
o
not output progress when not on a tty
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-20
Joh
a
n
nes Schindelin
rev-list --max-age,
-
-ma
x
-coun
t
:
support --boundary
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-20
Johannes S
c
hindelin
n
a
me
-
rev: av
o
id "
^
0" when unneede
d
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-20
Johan
n
es Schindelin
app
l
y:
fix memory leak in
p
refix_one()
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-18
Joh
a
nnes Schindelin
dif
f
--check:
u
se
colour
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-17
J
o
hannes Schi
n
de
l
in
name-rev: introduce t
h
e --refs=<pa
t
ter
n
> option
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-14
Johannes Schindelin
teach diff ma
c
hinery about --ig
n
ore-space-at
-
eol
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-13
J
o
h
a
nne
s
Schindeli
n
git-gc: run
p
a
c
k-refs by default unless the
repo is
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-09
J
o
h
a
nnes
S
c
h
indel
i
n
log
--reflog: use d
w
im_
l
o
g
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-09
Johannes S
c
hin
d
el
i
n
format-patch -n: mak
e
sorting easi
e
r
by padding number
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-09
Joha
n
nes Schindelin
log --reflog: honour --rela
t
i
v
e-date
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-09
Jo
h
annes
Schi
n
delin
fo
r
_
e
ach
_
reflo
g
_e
n
t:
be
forgi
v
ing ab
o
ut
mi
s
si
n
g
message
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-07
Johannes Schi
n
delin
fast-import: Fix
c
ompile
w
arnings
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-05
Jo
h
annes Schindeli
n
Commands requiring a
w
ork tree must not r
u
n in GI
T
_DIR
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-02
J
ohannes
S
chin
d
eli
n
Update the d
o
cum
e
ntation fo
r
the new '
@
{
.
.
.
}' synta
x
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-02-02
Joha
n
nes S
c
hin
d
elin
Teach
t
he '@{
.
.
.
}' not
a
tion to git-log -g
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-24
Joha
n
nes S
c
hinde
l
in
reflog inspection:
i
ntr
o
duc
e
s
h
o
rtcut "-g"
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-24
Johannes
S
chindelin
annotate: use
p
a
ger
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nnes Sc
h
in
d
elin
T
e
a
ch
r
evis
i
o
n
machi
n
ery about -
-
reverse
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Johanne
s
Schind
e
lin
--
w
alk-re
f
l
o
gs: do n
o
t c
r
a
s
h with
cy
c
lic reflog ancestry
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Johannes S
c
h
i
nd
e
lin
--walk-reflogs: act
u
ally find the right commit by da
t
e
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Johannes S
c
h
i
ndelin
--walk-r
e
flogs:
d
isallow unint
e
resting
c
ommits
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Sc
h
indelin
Teach the
r
evision walker to walk by reflogs w
i
th
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
J
o
ha
n
nes Schi
n
delin
D
o not verify
filenames in a
bare reposi
t
o
ry
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
J
ohanne
s
Schindelin
apply --ca
c
hed:
f
ix crash in s
u
bdire
c
tory
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nnes S
c
hin
d
e
l
i
n
show_date
(
): fix relative d
a
t
e
s
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-20
Joh
a
nnes
Schindel
i
n
c
o
n
f
i
g_
s
et_multivar(): disallow newlines in key
s
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-16
Joh
a
n
n
es Schindelin
F
i
x s
p
ur
i
ous
c
o
mpile error
...by: Johannes E. Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-10
Johannes
S
chindelin
F
i
x
t
1410 for core
.
filemode==false
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-09
Jo
h
annes Schind
e
lin
Sanitize
f
o
r_each_reflog_ent()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-31
Jo
h
a
nn
e
s Sch
i
n
d
elin
Fix yet
another su
b
tle xdl_merge() bug
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-28
Johanne
s
Schindel
i
n
x
d
l_merge(): fix
a
seg
m
entatio
n
f
a
ult when
r
e
fining
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-24
Joh
a
nnes Schi
n
delin
co
m
m
it-tree: enc
o
urage UTF-8 comm
i
t m
e
ssages
.
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
nn
e
s S
c
hi
n
d
e
lin
Ma
k
e gi
t
-re
r
ere a buil
t
in
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
J
o
hannes S
c
hindeli
n
A
d
d a test
f
o
r
git-rerer
e
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
Jo
h
an
n
e
s Schinde
l
in
mov
e
read_mmfile() int
o
x
d
iff-
i
nte
r
face
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
Jo
h
anne
s
Schind
e
l
i
n
git-res
e
t --hard: tell
t
he user
w
h
at t
h
e HEAD was reset
to
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes
Schin
d
e
lin
git-ta
g
: support -F <fil
e
> o
p
tion
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes
S
chindelin
Use git-m
e
rge-file in g
i
t-merge-one-file
,
t
oo
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
J
o
hannes Schinde
l
i
n
d
iff --
c
h
e
c
k: fix
o
ff by one
error
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-19
Jo
h
annes
Schi
n
del
i
n
Introduce GIT_T
E
MPLATE_DI
R
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-16
J
o
h
annes S
c
hinde
l
in
git-bran
c
h: r
e
name config vars branch
.
<
b
r
an
c
h>
.
*, too
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindelin
add
a fun
c
t
i
o
n to
r
e
name sections in t
h
e co
n
fig
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-16
Johann
e
s
Schindelin
Document
g
it-merg
e
-file
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-14
J
o
hannes Schind
e
lin
git-show:
grok
blobs, trees and tags, too
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-14
J
o
ha
n
nes
S
chindel
i
n
I
N
STALL:
no n
e
ed to ha
v
e GNU
d
iff inst
a
ll
e
d
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-13
Johannes Schinde
l
i
n
merge-re
c
ursi
v
e: ad
d
/
a
dd r
e
all
y
is modify/modify with
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-13
Johannes Schind
e
lin
Get rid
o
f
the depen
d
ency
on RCS'
m
erge program
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schindelin
merge-file: sup
p
ort -p and -
q
; f
i
x compile warnings
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schindelin
Add
b
uilt
i
n
m
er
g
e-file,
a minimal
r
eplacement for RCS
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-06
Joh
a
nnes Schindelin
cv
s
-migra
t
i
on d
o
cument: make the need
for "p
u
sh" more
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-05
Joh
a
nnes Sc
h
indelin
xdl_m
e
rge
(
)
:
fix and si
m
plify
c
onflict
h
andling
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
next