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
J
ohannes Schindeli
n
t
4
2
01:
D
o not
disp
l
a
y weir
d
c
h
aracters on the
t
ermin
a
l
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-04-10
Johannes
S
chindelin
Use print_
w
rapped_text(
)
in sho
r
tlog
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-28
Joh
a
n
nes Schindelin
t
4118:
b
e n
i
c
e
to non-GNU
s
ed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-24
Johanne
s
Schindelin
git-revert: R
e
vert revert message to
old
b
ehaviour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-23
Johannes Schin
d
elin
t4
1
18: be n
i
ce to non
-
GNU s
e
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johanne
s
Schinde
l
in
Pr
o
vide some
t
echni
c
al doc
u
m
e
n
tation for shallow clones
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schin
d
elin
Add a HOWTO fo
r
setting up a
standalone gi
t
d
a
emon
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes
Schindelin
xdiff/xutils
.
c
(xdl_hash_rec
o
r
d): factor out whitespac
e
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-14
Johan
n
es
S
ch
i
n
delin
Do not output "GEN " when
g
enerating perl
.
mak
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-12
Johannes Schind
e
l
in
gi
t
-bundl
e
: on
l
y die if
pack woul
d
b
e
empty
,
warn if
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes
S
c
hindelin
gi
t
-bundle: pr
e
v
e
nt over
w
riting
e
xisting bun
d
les
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
J
o
h
annes
Schindeli
n
git-bundle: die if
a
giv
e
n ref
is
n
o
t included
i
n
bundle
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johanne
s
Schindeli
n
git
-
bundle: handle thin
packs
i
n su
b
command "unbu
n
dle"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Joh
a
nnes Schindeli
n
gi
t
-bundle: Ma
k
e thin
p
a
c
ks
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Johannes Schin
d
elin
gi
t
-bundle: avo
i
d
p
acking objec
t
s
w
hich are in the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Joh
a
nnes Schind
e
lin
bundle: f
i
x
w
ro
n
g c
h
eck of r
e
a
d
_h
e
ader()'s return value
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johannes
S
chindelin
make t
8
0
0
1
work on
M
ac OS X
a
gain
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johannes
S
chindelin
Begin Subm
i
ttingPat
c
h
e
s
with a check list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Schin
d
e
lin
format-patch: add --inline option a
n
d
m
ake --at
t
ach
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schindelin
cherry-pick:
S
u
ggest a better method to retain auth
o
rship
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johan
n
es Schindelin
Get r
i
d of th
e
depende
n
cy to GNU diff in t
h
e tes
t
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
J
o
h
annes Schindelin
d
i
ff --no-
i
ndex:
s
up
p
ort /dev/nul
l
as
filename
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Sc
h
indelin
diff
:
support readi
n
g
a
file from std
i
n
v
i
a "-"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schindelin
Make git-revert & git-
c
herry-p
i
ck a builti
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes
Schindelin
Document the co
n
f
ig variable format
.
su
f
fix
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-03
Johannes S
c
h
ind
e
lin
b
u
iltin-archive: use RUN_SETUP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-02
Johan
n
es Sc
h
inde
l
in
print_wra
p
ped_text
:
fix output for
negative indent
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johannes Schi
n
delin
fetc
h
.
o depends on the headers, too
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
J
o
hannes Schindelin
d
iff: mak
e
more cases impli
c
it --no-index
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
J
o
han
n
e
s
Sch
i
ndelin
s
ho
w
_date(): rename the "relative"
p
arame
t
er t
o
"mod
e
"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Joha
n
nes Schindelin
Act
u
ally make print_wrapped_text() useful
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-26
Joha
n
n
e
s
Schindelin
d
iff --n
o
-
i
ndex: also imitate th
e
exit statu
s
of
d
iff(1)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-25
Johannes Schin
d
elin
Fix ty
p
o: do
no
t
sho
w
name1
when name2
f
ails
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johan
n
e
s
Schindel
i
n
object na
m
e:
i
n
troduce ':/<oneline prefix>' notation
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
J
o
hannes Schindel
i
n
Fixu
p
no-progre
s
s fo
r
fetch & clone
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes S
c
hi
n
delin
git-bundl
e
: reco
r
d commit summary in
the pre
r
equ
i
site
.
.
.
commit
|
commitdiff
|
tree
2007-02-23
J
ohannes
Schindelin
g
i
t-bu
n
dle: fix 'crea
t
e --all'
commit
|
commitdiff
|
tree
2007-02-23
Joha
n
n
e
s
Schindelin
git-bund
l
e: avoid fork() in verify
_
b
u
ndle()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes
Schindeli
n
g
i
t-
b
undle: assorted fixes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johan
n
e
s
Schinde
l
in
Add git-bu
n
dle: mo
v
e
o
b
j
ects and r
e
ferences b
y
arc
h
iv
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Jo
h
a
nnes S
c
hindeli
n
Mak
e
te
s
ts independe
n
t of global conf
i
g files
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
J
ohannes Schindelin
git-
d
iff
:
f
i
x combined diff
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindelin
pretty-formats: add
'
format:<strin
g
>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindel
i
n
Teach
git-dif
f
-
files the new option `--no-index`
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Sch
i
ndelin
apply
:
make
-
-verbo
s
e
a
l
ittle more useful
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johannes Schindelin
T
each diff -B a
b
o
u
t colours
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johannes
Schindelin
g
i
t grep: use pager
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Joha
n
ne
s
Schindelin
config: rea
d
s
y
stem
-
wide defau
l
ts f
r
om /etc/gi
t
config
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johanne
s
Sc
h
indelin
f
etch
& clone:
do not outpu
t
progre
s
s
when not
on a tty
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes Schindelin
re
v
-list --max-age, --max-co
u
n
t
: suppor
t
--
b
oundary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes Schindel
i
n
name-rev: avoid
"^0" when unn
e
ede
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johann
e
s
Schindelin
apply
:
fix
m
emory leak
i
n prefix_one()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-18
Johannes
Schindelin
diff --check: use
c
olour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-17
Johannes S
c
hindelin
name-rev: intro
d
uce the
-
-re
f
s=<pattern> optio
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-14
J
ohannes
S
chi
n
delin
teach diff mach
i
nery about
--igno
r
e-space-
a
t-eol
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-13
Johannes Schinde
l
in
g
i
t-g
c
: run pa
c
k-refs by def
a
ult un
l
es
s
the repo is
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Joh
a
nnes S
c
hindelin
l
og --ref
l
og: use
d
wim_log
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes
Schi
n
delin
fo
r
ma
t
-
patch -n: make s
o
rting e
a
sier by padd
i
ng number
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johan
n
es Sc
h
indelin
log
-
-re
f
log:
h
onour --r
e
lative-
d
ate
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Jo
h
ann
e
s Sch
i
ndelin
for_each_reflog
_
ent:
b
e forgivi
n
g ab
o
ut missi
n
g message
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-07
Johannes Schin
d
e
l
in
fast-im
p
ort: Fix compil
e
w
a
rnings
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-05
Johannes Sch
i
ndelin
C
ommands requirin
g
a work tree must n
o
t run in GIT_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johannes Sch
i
ndelin
Update th
e
documentatio
n
for the n
e
w '@{
.
.
.
}' syntax
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johannes S
c
hindelin
Teach the '@
{
.
.
.
}' not
a
tion to git-
l
o
g
-g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johann
e
s Schindel
i
n
reflog in
s
p
e
ction: introduc
e
shortcut "
-
g"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
J
ohannes Sc
h
indelin
annotate: use pag
e
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Jo
h
a
n
n
es Schindelin
Te
a
ch revision machinery about --reverse
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
n
n
es
S
chindelin
-
-
walk
-
reflogs:
do
n
ot cr
a
sh with cycl
i
c reflog an
c
estr
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
n
n
es Schi
n
delin
--wa
l
k-r
e
flogs: ac
t
ually
f
i
nd the right commi
t
by date
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joha
n
nes Schindelin
-
-
walk
-
refl
o
g
s: d
i
sa
l
l
o
w
unin
t
eresting commi
t
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nnes Schindelin
Teach the revis
i
on walk
e
r
to wal
k
by
r
eflogs w
i
th
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
n
nes S
c
hindelin
D
o
not verify fil
e
names in
a
b
a
re rep
o
sitory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johan
n
e
s
Schindelin
apply --cached:
fix cra
s
h in subdirectory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johanne
s
Schindelin
s
how_dat
e
(
):
f
ix r
e
lative
dates
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-20
Johannes Schind
e
li
n
config_set_multivar(
)
: disallow newlines in keys
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-16
Jo
h
an
n
e
s Schinde
l
in
F
ix
spurious compile error
commit
|
commitdiff
|
tree
2007-01-10
J
o
han
n
e
s
Schin
d
e
l
in
F
i
x t1410 f
o
r core
.
file
m
ode==false
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-09
J
o
h
a
nn
e
s
Schindelin
Sani
t
ize for_eac
h
_
reflog_en
t
()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-31
Johann
e
s Schindelin
F
i
x yet another s
u
bt
l
e x
d
l
_
mer
g
e() bug
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-28
Johannes
S
chindelin
xdl_merge()
:
fix a segm
e
ntation f
a
ult when
r
efining
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-24
Johan
n
es S
c
hindel
i
n
c
om
m
it-tree: enc
o
ura
g
e UTF-
8
commit m
e
ssage
s
.
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
Make git-r
e
r
ere a builtin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
es
S
chinde
l
in
Add a test for git
-
rerere
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schind
e
lin
m
o
ve
r
ead_mmfile(
)
into xdiff-interface
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schinde
l
in
git-reset --hard: tel
l
the user what the
H
E
AD was re
s
et to
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes
Schindelin
gi
t
-ta
g
: support -F
<file
>
opt
i
o
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johann
e
s Schind
e
lin
Use git-merge-file in git-merg
e
-one-fil
e
, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schin
d
elin
diff
-
-check:
fix off by one
error
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-19
Jo
h
ann
e
s Schindelin
Introduce GIT_TEMPLATE_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johan
n
es Schindelin
git
-
bra
n
ch
:
rename config
vars branch
.
<br
a
nch>
.
*, t
o
o
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
J
o
ha
n
nes S
c
hindel
i
n
add
a function to
rename sections in the
c
onfig
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes
S
chindelin
Document gi
t
-merge-file
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes
Schindel
i
n
git-show
:
grok bl
o
bs, trees
and tags
,
too
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes
Schindelin
INSTALL: no n
e
ed to
h
ave GNU diff installed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Joha
n
nes Schindelin
m
e
rge-recursive:
a
dd/add reall
y
is modify/mod
i
f
y
w
i
t
h
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johan
n
es Schindelin
Get rid
o
f
t
h
e dependenc
y
on RCS' merge program
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Jo
h
a
n
nes Schin
d
elin
m
erge
-
file: sup
p
ort -p and -q; fix compile warni
n
gs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Jo
h
annes Schindelin
Add builtin
m
erge-fil
e
, a minimal replacement for RCS
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johann
e
s S
c
hindelin
cvs-m
i
gration docume
n
t: make
th
e
n
e
ed for
"
p
u
sh" more
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Schindelin
xd
l
_merge(): fix and simplify c
o
n
f
lict
h
andling
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next