repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
GIT 1.5.3.6
2007-04-23
J
ohannes Schindel
i
n
dir
.
c
(
common_pr
e
fix
)
: Fi
x
two bugs
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-04-10
Johann
e
s Sch
i
ndelin
Us
e
pri
n
t
_
wr
a
pped_text() in shortl
o
g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-28
Johannes Schindeli
n
t4118: be nice t
o
non-G
N
U sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-24
Johann
e
s
S
chindelin
g
it-revert
:
R
e
v
ert revert message to old be
h
aviour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-23
Johannes Schindel
i
n
t4118: be
n
ice to non-GNU sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
J
o
hannes S
c
hindelin
Provid
e
some
t
echnical documentation for
s
hallow
c
lone
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schinde
l
in
Add a HOWTO for setting up a
s
ta
n
dal
o
n
e git daemon
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Sc
h
ind
e
lin
xdiff
/
xutils
.
c(xdl_hash_
r
eco
r
d): facto
r
ou
t
whitespace
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-14
Johannes Schin
d
eli
n
Do not outp
u
t "
G
EN
"
w
hen generating pe
r
l
.
mak
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-12
Joh
a
nn
e
s
Schin
d
elin
git-bundle: only die if pack would be
e
mpty, warn if
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Joh
a
nnes Sch
i
ndel
i
n
g
it-bundle: prevent
overw
r
itin
g
exist
i
n
g
bundles
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes
S
c
hindelin
git
-
bundle: die if a given ref i
s
not included in bun
d
l
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Joha
n
nes Sc
h
indel
i
n
git-bun
d
le
:
handle thin
p
acks in subcommand
"
u
nbundle"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Johannes Schindelin
git-bundle: Make thin packs
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Johannes Sc
h
indelin
g
i
t-bundle
:
avoid packing ob
j
ects whic
h
are i
n
t
h
e
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
J
oh
a
nnes Schin
d
elin
bun
d
le: fix wrong check of rea
d
_header()'
s
retu
r
n value
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johannes Schindelin
make
t8001 w
o
rk on Mac
OS X again
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Jo
h
annes S
c
hindelin
Begin Submittin
g
Patche
s
with a c
h
ec
k
list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johanne
s
Schindelin
format-patch:
a
dd --i
n
line option and
make --attach
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johann
e
s Schind
e
lin
cherr
y
-pick: Sugges
t
a
b
e
tter method to re
t
a
i
n
authorship
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schin
d
eli
n
Get r
i
d o
f
the
d
epende
n
cy
t
o
G
NU diff in the tests
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schindelin
diff --n
o
-
i
n
dex: s
u
pport /dev/null as fi
l
ename
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johann
e
s Schindelin
diff: sup
p
ort reading a file from stdin
v
ia "-"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schind
e
lin
Make git
-
revert & git-cherry-pic
k
a builtin
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Joha
n
nes Schindelin
Document the confi
g
variab
l
e fo
r
mat
.
suffix
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-03
Johannes Schi
n
delin
bu
i
ltin-ar
c
hive: use RUN_SETUP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-02
Johannes
S
chindelin
p
rint
_
w
rapped_tex
t
: fix output for negative in
d
ent
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johannes Sc
h
in
d
elin
f
etch
.
o depends on the headers, too
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
J
ohannes S
c
hind
e
lin
diff: make mo
r
e cases implicit --no-index
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
J
o
hannes Schindelin
show_d
a
t
e(): rename the "re
l
ativ
e
"
parameter to "mode"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Johannes Schindeli
n
Actually m
a
k
e
print
_
wra
p
ped_text() usef
u
l
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-26
Johannes
Schindelin
diff --no-in
d
e
x
:
also i
m
itate the exi
t
st
a
tus o
f
diff(1)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-25
Johannes S
c
hindelin
F
i
x
t
ypo: do
n
ot show
name
1
when nam
e
2 fails
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johannes Schindelin
ob
j
ect name
:
introduce ':/<on
e
line prefix>' notation
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johannes
S
chindelin
F
i
xup n
o
-progress
for f
e
tch & clone
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindelin
gi
t
-bundle:
r
ecord comm
i
t sum
m
ary in the
p
r
e
requ
i
site
.
.
.
commit
|
commitdiff
|
tree
2007-02-23
Johann
e
s
Schindel
i
n
g
i
t-bundle: fix 'create --a
l
l
'
commit
|
commitdiff
|
tree
2007-02-23
Joha
n
nes S
c
hindeli
n
git-bundle: av
o
id fork() in verify
_
bundle()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johanne
s
Schin
d
elin
git-bundle: a
s
s
o
r
ted
f
ix
e
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindelin
A
d
d git-bundle: move
o
b
j
e
c
t
s and
references by archive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindelin
Make test
s
i
nd
e
pendent of global confi
g
f
iles
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Sc
h
indelin
git-diff: fix
c
o
m
bined d
i
ff
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Jo
h
annes
S
c
hindelin
pr
e
tty-f
o
rmat
s
:
a
dd 'format:<strin
g
>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Joha
n
nes Schindelin
Teach git-diff-files the new opti
o
n `--no-index`
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Jo
h
annes Schindelin
apply: make --verbos
e
a little
m
ore useful
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
J
o
hannes Schindelin
Te
a
c
h di
f
f -B
a
bou
t
col
o
urs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johann
e
s
Schindelin
git grep: use pa
g
e
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Joha
n
ne
s
Schindelin
config: re
a
d
system-w
i
de def
a
ul
t
s
f
rom /etc/gitconfig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Joh
a
nnes
Schin
d
elin
f
e
tch & clone: do not output progress wh
e
n
n
ot on a tty
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Jo
h
anne
s
Schindelin
rev-list --max-age, --max-cou
n
t: support -
-
boundary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes Schindelin
name-rev: avoi
d
"^
0
" when unn
e
e
d
ed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johan
n
es Schindelin
apply: fix memory leak in pr
e
fix_one()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-18
Jo
h
annes Schi
n
deli
n
diff --check:
u
s
e c
o
l
o
ur
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-17
Joh
a
n
n
es Schindelin
na
m
e-re
v
: intr
o
d
u
ce t
h
e
--refs=<patter
n
> opti
o
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-14
Johannes Schinde
l
in
teac
h
di
f
f machinery about
--ig
n
ore-spa
c
e-at
-
eol
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-13
Johannes S
c
h
indel
i
n
git-g
c
:
run pack-refs by default unless t
h
e re
p
o is
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
J
o
hann
e
s S
c
hindelin
log
-
-reflog: use dwim_l
o
g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Jo
h
a
n
n
es Schinde
l
in
format-patch -n: make so
r
ting easi
e
r
by padding num
b
er
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johanne
s
Sc
h
i
n
del
i
n
log -
-
r
e
flog: honour
-
-r
e
l
a
tive-date
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Sc
h
indelin
for_each
_
reflog_ent:
be forgiv
i
n
g about missing mes
s
age
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-07
Johannes Schindel
i
n
f
ast-impo
r
t:
Fix com
p
ile warnings
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-05
J
o
ha
n
nes Schindel
i
n
Commands
r
equ
i
ring a w
o
rk tree
must not
run in GIT_
D
IR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Jo
h
ann
e
s
Schindelin
Up
d
ate the documentation
f
o
r
t
h
e new '@{
.
.
.
}' syntax
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johannes Sc
h
indelin
T
e
ach the '@{
.
.
.
}' not
a
t
i
on to gi
t
-log -g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johannes
S
chinde
l
i
n
reflog in
s
p
ection: intro
d
u
c
e
sho
r
tcut "-g"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
J
oha
n
nes Schindelin
ann
o
tate:
us
e
pag
e
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johann
e
s Schin
d
eli
n
Teach re
v
i
sion machinery abou
t
--
r
e
verse
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johan
n
es S
c
hindelin
-
-
w
alk-reflo
g
s
: do no
t
crash
with
c
y
clic reflog
a
ncestry
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
ohan
n
e
s
Schinde
l
in
--walk-refl
o
gs: actually fin
d
t
h
e ri
g
ht
c
ommit
by da
t
e
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindelin
--wa
l
k-reflogs: disal
l
ow uninteresting commi
t
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Sc
h
i
ndelin
Teac
h
the revisio
n
wal
k
e
r
to walk b
y
reflogs with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Sc
h
indelin
Do not verify filenames in a
bare repo
s
itory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nn
e
s Schindelin
ap
p
ly --cac
h
ed: fi
x
crash i
n
subdirec
t
ory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindelin
s
h
ow_date(): fix relative dates
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-20
Johannes Sc
h
i
ndelin
co
n
fig
_
s
e
t
_multivar():
di
s
allow new
l
ine
s
i
n
keys
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-16
Johanne
s
Schin
d
elin
F
ix spurio
u
s
c
ompile e
r
ror
commit
|
commitdiff
|
tree
2007-01-10
J
o
hannes Sc
h
indelin
Fix
t
1410 f
o
r
core
.
fi
l
emo
d
e==false
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-09
Johanne
s
Schind
e
lin
Sanitize for_ea
c
h_reflog_ent(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-31
Johann
e
s
Schindelin
Fix
y
et another subtle xdl_merge(
)
bug
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-28
Johanne
s
S
chindelin
xdl_m
e
rge(): fix a seg
m
e
ntation fault whe
n
refin
i
ng
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-24
Johannes Sch
i
nde
l
in
commit-tree:
e
ncourage UTF-8 comm
i
t m
e
ssages
.
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
Ma
k
e git-rerere a builtin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
Add
a
test
f
or
g
it
-
rerere
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
nnes Schindelin
m
ove read_mmfil
e
()
i
nto
xdiff-interface
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
git-r
e
set
-
-hard: tell the use
r
what the HEAD was reset to
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johanne
s
Schindelin
git-tag: support -F <file>
option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
n
n
es Sch
i
ndelin
Use git-me
r
ge-file in git-merge-one
-
file, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johanne
s
Schind
e
lin
dif
f
-
-check: fix off b
y
one
e
r
r
or
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-19
Johannes Schindelin
In
t
r
oduce GIT_
T
EMPLA
T
E_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Joh
a
nnes
S
c
h
indelin
g
i
t-br
a
nch: rename config vars branch
.
<branch>
.
*, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Joh
a
nnes
S
chin
d
elin
add a function to re
n
am
e
section
s
in
t
h
e c
o
nfig
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johann
e
s Schindelin
Docum
e
nt git
-
m
e
rge-file
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
J
o
hanne
s
Schindelin
g
it-s
h
ow: grok blobs, t
r
ees and ta
g
s, too
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes Schindelin
INS
T
ALL: no need t
o
have GNU diff install
e
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Joha
n
n
e
s
S
chi
n
delin
me
r
ge-recur
s
ive
:
a
dd/add real
l
y
i
s modif
y
/modify with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johanne
s
Schindelin
Get rid of the depende
n
cy o
n
RCS
'
m
e
rge
p
ro
g
r
am
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schindelin
merge-fil
e
: support -
p
a
n
d
-q; fix c
o
mpi
l
e warnings
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes
S
c
h
indelin
A
d
d bui
l
tin merge-file, a minimal r
e
placeme
n
t f
o
r RCS
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Joh
a
nnes Sch
i
n
d
e
lin
cvs-migration docum
e
nt: make the need f
o
r
"
push" more
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Johannes S
c
hindelin
x
d
l
_
m
erge(): fix and
simplify co
n
flict han
d
lin
g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next