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
Merge branch 'ss/svnimport'
2007-04-10
Johannes S
c
hindelin
Use print_wrap
p
e
d
_text() in shortlog
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-28
Johannes Schinde
l
in
t4118:
b
e nice to non-GNU sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-24
Johannes S
c
hin
d
elin
git-revert: Revert re
v
ert message to old
b
ehaviour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-23
J
ohann
e
s Sc
h
indelin
t4118: be nice to non
-
GNU s
e
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schi
n
d
elin
Provid
e
some technical docum
e
nt
a
tion fo
r
shallow clo
n
es
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schindelin
Add a HO
W
TO for setti
n
g up a
s
tandalo
n
e
git daemon
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
J
o
hann
e
s Schindelin
x
d
iff/xutils
.
c(x
d
l_h
a
sh_record
)
: factor out whitespa
c
e
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-14
Johannes
S
chindelin
Do n
o
t ou
t
pu
t
"GEN "
when ge
n
erating p
e
rl
.
mak
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-12
Johannes Schindelin
git-bundle: only d
i
e if pa
c
k
would
b
e
e
mpty, warn if
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johan
n
es S
c
hindel
i
n
git-
b
u
n
d
le: prevent ov
e
r
w
riting ex
i
st
i
ng bund
l
es
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Joh
a
n
n
e
s
Sc
h
indelin
git-
b
undle
:
d
ie if a given r
e
f
i
s not
i
n
c
luded
i
n
bundle
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Jo
h
a
nnes Schindelin
git
-
bu
n
dle:
handle
t
h
i
n pa
c
ks in subcommand "unbundle"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Joh
a
nnes
S
chindelin
g
it-bundle: Make
thin
pa
c
ks
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Jo
h
annes S
c
hi
n
de
l
in
git-bundle:
a
voi
d
packing o
b
ject
s
which are in the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johannes Schindeli
n
b
undle: f
i
x
wrong
c
heck of read_
h
eader()'s
r
eturn va
l
ue
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Joha
n
nes Schindelin
make t8001 work on Mac
OS
X
again
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Sch
i
ndelin
B
e
gi
n
Subm
i
t
t
ingPatches with a
c
heck li
s
t
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Joh
a
n
n
es Sch
i
n
d
eli
n
format-pat
c
h: a
d
d --
i
nli
n
e op
t
ion a
n
d
m
a
k
e --atta
c
h
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Joh
a
nnes Schinde
l
in
cherry-pick:
S
ug
g
es
t
a better meth
o
d t
o
retain authorship
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Joha
n
n
e
s Schindelin
Get rid of t
h
e dependency to G
N
U dif
f
in the tests
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schindelin
diff --no-in
d
e
x: support /dev/null as filename
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johan
n
es Sch
i
n
d
elin
diff:
s
upport reading a file from
std
i
n
via "-"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
J
o
hannes
Schinde
l
i
n
Mak
e
git-revert & git-c
h
er
r
y-pick
a builtin
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Jo
h
a
n
nes Schindelin
Do
c
ument the config
v
ariable fo
r
m
a
t
.
suff
i
x
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-03
Joha
n
ne
s
S
c
hindelin
builtin-archive
:
use RUN_SETUP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-02
Johannes Schindelin
p
rint_
w
rapped_te
x
t: fi
x
out
p
ut
f
or
ne
g
ative indent
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johannes S
c
hindelin
fetch
.
o depe
n
ds on the headers, too
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
J
ohannes
S
c
hindelin
diff: make m
o
re c
a
ses impl
i
cit --no-index
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Johannes Schindelin
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 Sch
i
ndelin
Actually
m
a
k
e pri
n
t_wrapped_text()
us
e
ful
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-26
Johan
n
es Schindel
i
n
diff --no-index: also i
m
itate the ex
i
t status
o
f diff(1)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-25
Johann
e
s
S
ch
i
ndelin
Fi
x
typo: do not show
n
ame1 when name2 fa
i
ls
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Joha
n
n
es Schindel
i
n
ob
j
ec
t
n
ame: introduce ':/<o
n
eline prefix>' notation
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johannes Schindelin
Fixup no-progr
e
ss
f
o
r f
e
tc
h
& cl
o
ne
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
J
o
hannes Schindel
i
n
g
i
t-bund
l
e: record commit s
u
mmary in the pre
r
equisit
e
.
.
.
commit
|
commitdiff
|
tree
2007-02-23
Jo
h
annes Schindelin
g
it-bundle: f
i
x 'cre
a
te --all
'
commit
|
commitdiff
|
tree
2007-02-23
Johannes
S
chindelin
git-bundl
e
: avoid fo
r
k(
)
in veri
f
y_bu
n
d
l
e
()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johan
n
es Schindelin
git
-
bund
l
e: a
s
sorted fixes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schi
n
deli
n
Ad
d
git-bundle
:
move
o
bjects an
d
ref
e
r
e
nces by archive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
J
ohannes Schind
e
lin
Make
t
es
t
s ind
e
p
en
d
ent of global config files
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes
S
chind
e
lin
git-
d
iff: fix
c
om
b
ined diff
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Joh
a
nnes Schindelin
pre
t
ty-form
a
ts: add 'forma
t
:<string>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schinde
l
i
n
Te
a
ch git-diff-files the new option `--no
-
index
`
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Joh
a
nnes Schindelin
appl
y
: make --
v
erbos
e
a l
i
ttle
m
ore usef
u
l
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johanne
s
Schindel
i
n
T
e
a
ch diff
-B abou
t
c
o
lours
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johannes Sc
h
in
d
eli
n
git grep: use pager
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
J
o
hann
e
s
Schindelin
c
o
nfig: r
e
ad system-wide defaul
t
s from
/etc/gitco
n
fig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes Schi
n
d
e
lin
fe
t
ch & clone: do no
t
outp
u
t
progress when not
o
n a tty
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes Schinde
l
in
rev-list --max-a
g
e, --max-count: support --boun
d
ary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
J
o
ha
n
nes S
c
hi
n
delin
name-rev: avoid "^0" whe
n
unneede
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes S
c
hindelin
apply: fix memory l
e
ak in pre
f
ix_
o
n
e
()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-18
Johannes Schindelin
diff --check: use c
o
lour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-17
Johannes
Schind
e
lin
name-rev: introd
u
ce th
e
--re
f
s=<pa
t
tern> o
p
tio
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-14
Johannes S
c
hin
d
e
l
in
teach dif
f
mach
i
ne
r
y about
-
-
i
gnore-space-
a
t
-
eo
l
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-13
J
o
hanne
s
Schindel
i
n
gi
t
-gc: run pac
k
-
r
e
f
s
by default
unl
e
ss
t
he
r
epo
i
s
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johanne
s
Schindelin
log --reflog: use dwim_log
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes S
c
hindelin
format-patch -n
:
make so
r
ting
easier by padding numbe
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schindelin
l
og -
-
reflog: honour --rel
a
tive-date
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Joha
n
nes Schindelin
for_each_reflog_en
t
:
b
e
forgiving about missing message
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-07
Johanne
s
Schindelin
fa
s
t-impo
r
t: Fix
c
omp
i
le war
n
ings
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-05
Jo
h
annes Sch
i
ndelin
Comman
d
s requiring a
work tree mu
s
t not run in GIT_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johannes Schindelin
Update
t
h
e
d
o
cumentatio
n
for the
n
e
w
'@{
.
.
.
}' syntax
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Joh
a
nnes S
c
h
i
ndelin
T
each the '@{
.
.
.
}' notation to git-log -g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johannes Sch
i
ndelin
reflog inspec
t
ion: introduce
s
ho
r
tc
u
t "-g"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johan
n
es Sc
h
indelin
annotate
:
use pager
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
hannes Schindelin
T
eac
h
rev
i
sion machinery about -
-
reverse
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nn
e
s Schindel
i
n
--walk-reflo
g
s: d
o
not crash with
c
y
cli
c
reflog ancestry
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
oha
n
nes S
c
h
inde
l
in
--w
a
lk-r
e
flogs: actua
l
l
y
find the right commit
b
y
date
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joha
n
ne
s
S
c
hindeli
n
--walk-re
f
logs: disallow uninteresting commits
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Sch
i
ndelin
Teac
h
the re
v
i
s
io
n
walker to walk
b
y reflogs
w
i
t
h
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
ohannes Sc
h
ind
e
l
i
n
Do not verify filena
m
es in a b
a
r
e repository
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindelin
apply --cached
:
fix cr
a
sh
i
n subdirec
t
or
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
h
annes S
c
hindelin
show_date(
)
: fix
r
elative da
t
es
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-20
Johannes Schinde
l
in
config_se
t
_multi
v
ar(): disa
l
low newlines i
n
keys
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-16
Johannes Sc
h
indelin
Fix spuriou
s
c
ompile error
commit
|
commitdiff
|
tree
2007-01-10
Johannes Schindelin
Fix t1410 for core
.
filemode==false
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-09
Johann
e
s Schindelin
Sanitize fo
r
_each
_
reflog_ent()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-31
J
ohannes Schindelin
Fix
yet another subtl
e
xdl_
m
e
rge() bug
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-28
Johannes Schin
d
e
l
in
xdl_merg
e
(): fix a segmentation fault wh
e
n re
f
ining
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-24
Johannes
S
chindelin
commit-tree: encour
a
ge
UTF-8
c
ommit
messages
.
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schinde
l
i
n
Make git-rerere
a builtin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
A
d
d a test for git-
r
erer
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes
S
chindelin
move read
_
m
m
f
ile(
)
i
nt
o
xdiff-inter
f
a
c
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
nnes S
c
h
ind
e
li
n
g
i
t
-
reset
--hard: tell
the user what the HEAD was res
e
t to
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Jo
h
annes Sc
h
i
n
delin
git-tag: support -F
<
f
i
le
>
option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
Use
g
it-merge-file in git-
m
erge-
o
ne-file,
t
oo
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes
S
chin
d
elin
di
f
f --check: fix off by one error
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-19
Joh
a
nnes Sc
h
indelin
Introduce GIT_TEMPLAT
E
_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes S
c
hindel
i
n
git-bran
c
h: re
n
ame
c
o
n
fig var
s
branc
h
.
<
b
r
an
c
h>
.
*
,
too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Joha
n
n
es Schindelin
a
dd a functi
o
n to rename
s
e
c
t
i
on
s
i
n the confi
g
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
J
o
h
annes Schin
d
elin
Do
c
ume
n
t
g
i
t
-merge-file
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Jo
h
ann
e
s Schin
d
elin
git-show: gro
k
blobs, trees and
t
ags, too
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes S
c
hi
n
delin
INSTALL: no need to
have GNU
diff installe
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johanne
s
Sc
h
ind
e
lin
mer
g
e-recur
s
ive: add/add
r
eall
y
is modify/modify with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Jo
h
annes Schindelin
Get ri
d
of the de
p
endency o
n
RCS' merge program
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schindelin
merge-fi
l
e: suppo
r
t -p and -q; fix compile
w
arnings
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes S
c
hindelin
Add bui
l
t
in mer
g
e-fi
l
e
,
a minimal re
p
lacement for RCS
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schindeli
n
cvs-migration document: make
t
he need for "push" more
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
J
o
hannes Schindel
i
n
x
dl_merge(): fix and simplify conflic
t
handling
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Joha
n
nes Schindelin
diff
-
b: ignore whitespac
e
at end of line
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next