repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-svn: Don't rely on $_ after making a function call
2007-04-23
Johannes Schindelin
dir
.
c(c
o
mmon_pref
i
x
)
:
Fix t
w
o b
u
g
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-28
Jo
h
a
n
nes S
c
hindelin
t4118:
b
e n
i
ce t
o
non-GNU s
e
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-24
Joha
n
nes S
c
h
i
ndelin
git-revert: Rever
t
re
v
ert m
e
ssage to
o
ld behaviour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-23
J
o
hannes
S
chi
n
d
e
lin
t4118: be ni
c
e t
o
non-GNU
s
ed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Jo
h
annes Schindelin
Provide some te
c
hnical documentation for shallow clone
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schindelin
Ad
d
a HOWTO for sett
i
ng up a
s
t
andalone git da
e
m
o
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schi
n
delin
xdiff/xutils
.
c(xdl_hash_re
c
ord): fact
o
r out whi
t
espace
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-14
J
oha
n
nes
Schind
e
lin
Do not output "GEN
"
w
hen ge
n
e
r
a
tin
g
p
e
rl
.
ma
k
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-12
Johannes Sch
i
n
d
e
l
i
n
git-bundle:
o
nly die if pa
c
k would be empty, w
a
rn if
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johann
e
s
Schindelin
git-bundle:
p
r
eve
n
t over
w
riting exis
t
ing bundle
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes S
c
h
indelin
git-b
u
ndle:
d
ie
i
f
a
g
iven ref is
not included i
n
bundle
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes Schindelin
git
-
bundle: handle thi
n
pa
c
k
s
in subcommand "un
b
undl
e
"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Johannes Schinde
l
in
git-
b
undle: Make thin packs
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Johan
n
es Schin
d
elin
git-bu
n
dle: avoi
d
packing objects which are in
the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johann
e
s Sch
i
ndelin
bund
l
e: fi
x
wrong check
o
f read_header()'s return va
l
u
e
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johannes Schindelin
make t8
0
01 work on Mac
O
S X again
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
J
o
ha
n
nes Schi
n
deli
n
Begin
Submit
t
ing
P
atches with a che
c
k list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Sch
i
ndeli
n
f
orm
a
t
-
patch:
a
dd --inline
o
ption and make --attach
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Jo
h
annes
Schindelin
c
h
erry-pick
:
Suggest a better m
e
thod to retai
n
authorsh
i
p
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Joha
n
nes
S
c
hi
n
delin
Get rid
o
f th
e
dependency to GNU
d
iff in the tests
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes
S
ch
i
ndeli
n
diff --no-i
n
d
ex: support /
d
ev/nu
l
l as filename
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
J
ohannes Sc
h
indelin
d
iff: support read
i
n
g
a fi
l
e
fro
m
s
tdin via
"
-"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Joha
n
nes Schin
d
elin
Make git-revert & git-cherry-pick a builti
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
J
o
hannes Schindelin
Document
t
he config variab
l
e
for
m
at
.
suffix
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-03
Johann
e
s Schind
e
lin
bu
i
ltin-
a
rch
i
v
e
: us
e
RUN_SETUP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-02
Johannes
S
chin
d
el
i
n
print_wrapped_text: f
i
x output for
n
egative indent
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johann
e
s Schindelin
fet
c
h
.
o depends on t
h
e headers, too
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johannes
S
ch
i
ndelin
diff
:
make more
c
ases imp
l
icit --no-ind
e
x
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Johannes Sc
h
indelin
show_d
a
te(): rena
m
e the
"
r
el
a
tive"
p
aram
e
ter to "mo
d
e
"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
J
ohan
n
es Schind
e
l
in
Actu
a
lly make pr
i
n
t
_
w
rapped_text() useful
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-26
J
ohannes Schindelin
diff --no-index: also imit
a
te
the e
x
it status
o
f diff(1
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-25
Jo
h
anne
s
Schi
n
d
elin
Fix typo: do n
o
t sho
w
name1 when name2 fai
l
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johannes Sch
i
ndelin
object name:
in
t
roduce ':/<
o
ne
l
ine prefix>' no
t
ati
o
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johannes S
c
hind
e
lin
F
ixup no-pro
g
ress for fetch &
c
lon
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johan
n
es Schindel
i
n
g
i
t
-bundle: record co
m
m
it su
m
mary in the prerequis
i
te
.
.
.
commit
|
commitdiff
|
tree
2007-02-23
Jo
h
annes Schindelin
git-bundle
:
fix 'create --a
l
l'
commit
|
commitdiff
|
tree
2007-02-23
Johannes
S
chindelin
git-bundle: a
v
o
i
d fork()
in verif
y
_bundle()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Joh
a
nnes Schindelin
g
it-bu
n
dle:
a
s
sorted fixes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Joh
a
nnes Schind
e
lin
Add git-bundle:
m
o
v
e
obje
c
ts
and refe
r
ences by
arc
h
ive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johanne
s
S
ch
i
n
d
elin
Make tests ind
e
pendent of global config files
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Joha
n
nes Sch
i
nde
l
in
git-diff:
f
ix
c
ombined diff
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Sc
h
indel
i
n
pretty
-
formats: ad
d
'format:<string>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johann
e
s Schindelin
Teach git-diff-files the new option `-
-
n
o-index
`
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
J
o
h
annes Sc
h
i
ndelin
a
pp
l
y: make --verbose a little more useful
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Joha
n
n
e
s Schindelin
Te
a
c
h d
i
ff -B about col
o
urs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johannes
Schindelin
git
grep: use page
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
J
ohannes Schindelin
config: read s
y
s
tem-
w
ide defaults from
/
etc/gitco
n
fig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Jo
h
an
n
es Schindelin
fetch & clone: d
o
n
o
t o
u
tput progress
w
hen n
o
t o
n
a tty
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Joha
n
nes
S
chi
n
delin
rev-list --max-age, --max-co
u
nt: support --boundary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes
Schindelin
name
-
rev
:
a
void "^0" when un
n
eed
e
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes Schi
n
delin
apply: fix me
m
o
ry leak in prefix_on
e
()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-18
J
o
hann
e
s Sch
i
nd
e
lin
diff --check: use col
o
ur
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-17
Johannes S
c
hindelin
name-rev: introduce the -
-
refs=<patt
e
r
n
> o
p
tion
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-14
Johannes Schind
e
lin
teach di
f
f machine
r
y about --ignore-sp
a
ce-
a
t-eol
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-13
Johannes Schindeli
n
g
i
t-g
c
:
r
u
n
pac
k
-refs by defa
u
lt unless
t
he rep
o
is
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johanne
s
Schindelin
log --reflog: u
s
e dwim_log
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes
Schindelin
f
o
r
m
at-patch -n: make sorting easier by
p
a
d
ding number
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Sc
h
indelin
log
--reflog: honour --relative-date
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schin
d
elin
for_e
a
ch_r
e
flog_
e
n
t:
b
e forgiving about missing mes
s
age
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-07
J
o
hannes
S
chindelin
fast-imp
o
rt: Fix compile wa
r
nings
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-05
Johannes Schin
d
elin
Comma
n
ds requiring
a wor
k
tre
e
must no
t
run in GIT_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Joha
n
nes Schinde
l
in
U
pd
a
te t
h
e documentation f
o
r
the new '@{
.
.
.
}' syntax
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johannes
S
chindelin
Teach
t
h
e
'@{
.
.
.
}'
n
otation to gi
t
-log -g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Joh
a
nnes Sch
i
ndel
i
n
reflog
inspectio
n
: introduce sho
r
tcu
t
"-g"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johannes Schindelin
annot
a
te: use p
a
ger
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joha
n
nes Sc
h
indelin
Teac
h
revisio
n
m
ac
h
iner
y
about --r
e
ver
s
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nne
s
Schindelin
--wa
l
k
-
reflogs:
do not crash with
c
y
cl
i
c
r
e
flog anc
e
s
tr
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindelin
--walk-reflo
g
s: actua
l
ly fi
n
d the ri
g
ht commit by date
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
hannes Schindelin
--wa
l
k-re
f
log
s
:
d
isallo
w
uninteresting commits
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Jo
h
annes Sc
h
indelin
Teach the
r
e
v
i
sion wal
k
er to
wa
l
k
by
r
eflo
g
s with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Jo
h
annes
S
chindelin
Do not
verify filename
s
in a bare rep
o
s
i
tory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindelin
apply
-
-c
a
c
hed: fix crash in sub
d
i
rector
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
hannes
S
chindeli
n
show_da
t
e(): fix relative dates
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-20
J
o
ha
n
ne
s
Schindel
i
n
config_set_
m
ult
i
var(): disallow newlines in keys
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-16
Johannes Schindelin
F
i
x spurious c
o
mp
i
le
error
commit
|
commitdiff
|
tree
2007-01-10
J
oh
a
nnes S
c
hindelin
F
ix t141
0
for
c
o
r
e
.
filemode
=
=false
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-09
Johannes Schindel
i
n
Sanitize for
_
eac
h
_
r
eflog_en
t
(
)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-31
Johannes Schindelin
F
ix yet
a
nother sub
t
le xdl_merge() bug
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-28
Johanne
s
Schindelin
xdl_merge(): fix
a
segmentation
faul
t
when re
f
ini
n
g
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-24
Johanne
s
Schindelin
c
o
m
m
it-t
r
ee: en
c
ou
r
a
ge UTF-
8
commit me
s
sages
.
commit
|
commitdiff
|
tree
2006-12-22
Joha
n
n
es Schindelin
Ma
k
e git-
r
e
r
er
e
a builtin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
o
h
a
n
nes Sc
h
indelin
A
d
d a test f
o
r gi
t
-rerere
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johann
e
s Schinde
l
in
move read_
m
mfile() into xdi
f
f-interface
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
es Schindelin
gi
t
-
r
e
s
et --h
a
rd: tel
l
th
e
us
e
r
wha
t
the HEAD was reset to
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
nnes Schindelin
git-
t
a
g: support
-
F
<
f
ile> option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes
Schindeli
n
Use gi
t
-merge-
f
ile in gi
t
-mer
g
e-on
e
-file, t
o
o
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
oha
n
nes S
c
hindelin
diff --check:
f
ix of
f
by one error
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-19
Johannes
S
c
h
indeli
n
Introduce GIT_TEMPL
A
TE_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Sc
h
indelin
git-branch: rename config va
r
s branch
.
<branch>
.
*, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Jo
h
annes
S
chi
n
del
i
n
add a f
u
n
c
tion
t
o rename se
c
tions in the config
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindel
i
n
Docu
m
ent git-m
e
rge-file
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes Schinde
l
in
g
i
t
-
s
h
ow: g
r
ok
blobs, trees and tags, too
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes Sc
h
in
d
elin
INST
A
LL: no n
e
ed to have GNU di
f
f
in
s
talled
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Joha
n
nes Schindelin
merge-rec
u
rsiv
e
: add/add really i
s
modify/modify
wit
h
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johannes Schind
e
lin
Get
r
id of the d
e
pendency on
RCS' merg
e
pro
g
ram
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes
S
chindelin
m
e
rge-fi
l
e: support -p
and -q; fix compil
e
warnings
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Joh
a
nne
s
Schind
e
lin
Add builtin merge-file, a m
i
nimal replacement for RCS
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schindelin
cvs-migrati
o
n
document: m
a
ke the need for "push
"
more
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Schind
e
lin
xdl_merge
(
): fi
x
and simplify conflict
han
d
l
i
ng
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Sc
h
inde
l
i
n
d
iff -b: ignore whitespace at end of line
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next