repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Create a sysconfdir variable, and use it for ETC_GITCONFIG
2007-04-23
Johannes Schi
n
delin
dir
.
c(com
m
on_p
r
efi
x
): Fix tw
o
bug
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-28
Joha
n
n
es
Schind
e
lin
t4118
:
be ni
c
e to no
n
-
G
NU sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-24
Johanne
s
Schindelin
g
it-revert: Revert revert message
t
o old be
h
aviour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-23
Johannes Sch
i
n
d
elin
t411
8
:
be nice to
n
o
n-GNU sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schi
n
delin
P
r
ov
i
de s
o
me technical doc
u
mentation for sh
a
llow
clones
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johan
n
es Schindelin
Add a
H
OWTO
f
or setti
n
g up
a
s
t
andalo
n
e g
i
t
daemon
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Jo
h
annes
Sch
i
ndel
i
n
xdif
f
/xut
i
ls
.
c(xdl_hash_record): fact
o
r
o
ut
w
hitespace
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-14
Johannes Schindel
i
n
Do n
o
t output "GE
N
" when
gene
r
ating perl
.
mak
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-12
Johannes Schindelin
git-bundle: onl
y
die if pack
w
o
uld be emp
t
y
,
war
n
if
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes Schindelin
git-bundl
e
: prevent overwriting existin
g
bundles
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes Schi
n
delin
git-
b
u
n
d
l
e
: die if a
given r
e
f is no
t
i
n
cl
u
ded in
b
undle
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes
S
chinde
l
in
g
i
t
-
bundle:
h
a
ndle
t
hin packs i
n
subcommand "unbund
l
e"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Johannes S
c
hi
n
deli
n
g
it-bundl
e
: Make thin p
a
cks
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Joh
a
n
n
es Schindelin
git-bundle: avoid
pac
k
ing objects
which are in
t
h
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johannes Sc
h
inde
l
in
bun
d
l
e
: fix wrong check of read
_
header
(
)'s return va
l
ue
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
J
o
ha
n
nes Schindelin
make t80
0
1
w
ork on
M
ac
OS
X
again
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Sch
i
ndelin
Begi
n
Submitti
n
g
Pa
t
ches w
i
th a c
h
eck list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Joha
n
nes Schinde
l
in
f
o
rmat-patch: add -
-
inline
o
ptio
n
and mak
e
--
a
ttach
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
J
o
hannes
S
chindelin
che
r
ry-pick: Suggest a better method to retain authorship
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
J
o
hannes
Schin
d
eli
n
Get rid of the dependenc
y
to GNU diff in the tests
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Jo
h
anne
s
Schindelin
d
iff
--no-in
d
ex
:
support /de
v
/null as filename
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes
Sch
i
ndelin
diff: supp
o
rt
reading a fi
l
e from stdin v
i
a "-"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schind
e
lin
Make git-revert & git-cherr
y
-pick
a
builtin
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Joh
a
n
nes Sc
h
indelin
D
o
c
u
ment the config varia
b
le format
.
suffix
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-03
Joh
a
nnes
S
chindelin
builtin-arc
h
ive: us
e
R
UN_SET
U
P
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-02
Johannes Sch
i
n
d
el
i
n
print
_
wrapped_tex
t
: fix output for
negative i
n
dent
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johannes Schindelin
fetch
.
o
depends on t
h
e headers, too
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Joh
a
nnes Sch
i
ndelin
d
iff:
m
ake more cases impl
i
cit --no-index
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
J
o
han
n
e
s Sc
h
inde
l
in
show_date():
r
ename the "rel
a
tive"
parameter
to "mode"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Johannes
S
c
hin
d
elin
Actually make print_wr
a
pped
_
text() useful
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-26
Johannes Schindelin
diff --
n
o
-
index: als
o
imitate
the ex
i
t
sta
t
us of dif
f
(1)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-25
Johannes
Sch
i
ndelin
F
i
x ty
p
o: do not show nam
e
1
w
h
en
n
ame2
f
ails
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
J
o
hannes Schi
n
delin
object name: i
n
trodu
c
e ':
/
<oneli
n
e prefix>' no
t
ati
o
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
J
o
h
a
n
nes Schind
e
lin
Fixup no-progress
f
o
r
fetch & clon
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Joh
a
n
ne
s
S
chindeli
n
git-bu
n
dle: record
com
m
it summa
r
y in t
h
e
prerequisite
.
.
.
commit
|
commitdiff
|
tree
2007-02-23
Johanne
s
Sch
i
ndelin
git-bundl
e
: fix 'cre
a
te --all
'
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindelin
git-bundle: av
o
id fork() in verify_
b
u
ndl
e
()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes
S
chindelin
git-
b
undle: ass
o
rted fi
x
es
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes S
c
hindelin
Add g
i
t-bundle: mov
e
ob
j
ect
s
and references by ar
c
hive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schin
d
elin
M
ake t
e
sts
i
n
d
ependent of global
config files
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johan
n
es S
c
hind
e
lin
git-diff:
f
ix combine
d
diff
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johan
n
es Schi
n
delin
pretty-formats: add 'form
a
t:<string>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Joha
n
nes Schindelin
Teach gi
t
-diff-files the
new
o
p
tion `--no-ind
e
x`
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johann
e
s
Schin
d
elin
a
pply:
m
ake -
-
ve
r
bos
e
a little more
u
sef
u
l
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
J
o
ha
n
nes Sc
h
indelin
Teac
h
d
iff -B ab
o
ut colours
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Joh
a
nnes Schi
n
deli
n
git grep:
use pa
g
e
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johann
e
s Sc
h
ind
e
lin
conf
i
g: re
a
d s
y
stem-wide defaults
f
r
om /etc
/
gitconfig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johanne
s
Schindelin
f
e
t
ch & cl
o
ne
:
do not output progr
e
ss when no
t
on a
tty
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
J
ohannes
Sch
i
ndelin
rev-l
i
st --max-age, --max-count: support --
b
oundary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Jo
h
annes
Schindelin
name-rev: avoid
"^0" when unneeded
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johan
n
es S
c
hindelin
a
pply: fix memory leak
in prefix_one()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-18
Joh
a
nne
s
Schin
d
elin
d
i
f
f
--check: use colour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-17
Johannes Schind
e
lin
na
m
e-rev: introduce
t
he --re
f
s=
<
patter
n
>
option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-14
Jo
h
annes Schindelin
t
each
d
iff machinery
about --ignore-space
-
at-eo
l
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-13
Johann
e
s Sch
i
n
d
elin
g
it-gc: r
u
n pack-refs by default
un
l
ess t
h
e repo is
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schi
n
delin
l
o
g
-
-
r
eflog:
u
se
dwim_log
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Joh
a
nnes Schindelin
f
o
rmat-patch -n: mak
e
s
orting easier by padding nu
m
ber
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schindelin
log --reflog: ho
n
our --relative-date
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schi
n
d
elin
for
_
e
a
c
h
_refl
o
g_ent: be forgiving about mi
s
sing message
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-07
Johannes Schindelin
fast-
i
mport: Fi
x
c
ompile warnings
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-05
Johannes Schindelin
Co
m
mands
re
q
uiring
a work tr
e
e
must not r
u
n in GIT
_
DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johannes Schi
n
delin
Update the documentation
for the new '@{
.
.
.
}' syntax
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johann
e
s Schindelin
Teach the '@{
.
.
.
}
'
notation to git-log -g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johannes Schindelin
reflo
g
inspection:
i
ntroduce s
h
ortcut "-g"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johannes S
c
hin
d
e
l
in
annotate:
use
p
ager
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johann
e
s Schindeli
n
Te
a
ch
r
evision mac
h
inery about
--reverse
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johan
n
e
s Schind
e
lin
--w
a
lk-reflogs: do no
t
crash wit
h
cyc
l
ic reflog ancest
r
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nnes
Sch
i
ndelin
--walk
-
r
e
flogs: actuall
y
find the
righ
t
c
omm
i
t
by date
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johanne
s
Schindelin
--
w
alk-reflogs: disallow uninteresting com
m
its
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
hann
e
s Schindelin
T
e
a
c
h the revis
i
on walke
r
to walk b
y
refl
o
gs with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
h
annes Schi
n
d
elin
Do not veri
f
y f
i
l
e
names in
a bar
e
reposi
t
ory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindelin
apply -
-
cached: fix crash in sub
d
i
rectory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nnes Schinde
l
in
sho
w
_date
(
)
:
fix relative dates
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-20
Jo
h
annes Schindeli
n
config_
s
et_multiva
r
(): di
s
allo
w
new
l
ine
s
in keys
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-16
J
o
hannes Schindel
i
n
Fix spurious compile error
commit
|
commitdiff
|
tree
2007-01-10
Johannes Schindelin
Fix t1410 for core
.
fi
l
em
o
de==fals
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-09
Johanne
s
S
c
hindeli
n
Sanitize for_each_
r
e
f
log_
e
nt()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-31
Jo
h
annes Schindelin
Fix
yet ano
t
h
e
r subtl
e
xdl_merge() bug
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-28
Johannes Schinde
l
i
n
xdl_mer
g
e(): fix a segmentati
o
n fault wh
e
n refining
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-24
Joh
a
nnes Schindel
i
n
c
o
mmit-tr
e
e: e
n
courage UTF-8 commit messa
g
es
.
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
es S
c
hindelin
Ma
k
e git
-
rere
r
e
a
b
uiltin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johann
e
s Schindelin
Add a
test f
o
r
git-rere
r
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johanne
s
Schinde
l
in
move read_mmfile() into xd
i
ff-interf
a
ce
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
o
han
n
es Schi
n
delin
git-reset --hard:
t
ell the us
e
r
what
the HEA
D
was reset t
o
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
es Schin
d
elin
git
-
tag: suppor
t
-F <fi
l
e>
option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindeli
n
Us
e
g
i
t
-merg
e
-file
in
g
it-merg
e
-one-file, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
o
h
annes S
c
hindelin
d
i
f
f
--check: fix of
f
by one
e
r
r
or
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-19
Joha
n
nes Schindel
i
n
Int
r
oduce GI
T
_TEMPLATE_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes
S
c
hi
n
d
elin
git-branch:
r
e
name config vars bran
c
h
.
<branch>
.
*, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schinde
l
i
n
add a
f
u
n
ct
i
on to rename sectio
n
s in t
h
e c
o
nfig
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johan
n
es Schi
n
del
i
n
Document git-mer
g
e-file
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes Sch
i
n
d
elin
g
i
t-sho
w
:
g
r
o
k
b
lobs, trees and
tags
,
t
o
o
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes Schi
n
delin
INST
A
LL: no need to have GNU d
i
ff installed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johannes S
c
hind
e
lin
merge-
r
ecursive: a
d
d
/add real
l
y is modify/m
o
d
i
fy with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johanne
s
Schindelin
Get
r
id of the
d
ependen
c
y on RCS' merge pr
o
gram
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johan
n
es Schi
n
deli
n
merge
-
file:
suppor
t
-p and -q
;
f
ix compile warnings
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes
Schindelin
Add builtin merge-
f
ile, a minima
l
r
eplac
e
me
n
t for
RCS
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Jo
h
annes
Schind
e
l
i
n
cvs-mi
g
r
at
i
o
n docu
m
ent: make the
n
eed for
"push
"
m
o
r
e
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Joha
n
nes Schindelin
xdl
_
mer
g
e(): fix and sim
p
l
i
fy
c
o
nflict handling
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Sc
h
indel
i
n
d
i
ff -b: ig
n
ore wh
i
tespace at
end
o
f
lin
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next