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
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-28
Johann
e
s Schindel
i
n
t4118
:
be nice to non-
G
NU sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-24
Johannes Schindelin
git-revert: Revert revert
mes
s
age to
o
ld behavio
u
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-23
Johannes
Schind
e
lin
t
4
11
8
: be
n
ice
to non-GNU sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes
S
chi
n
delin
Provide
so
m
e
tec
h
nical docum
e
ntation for shallow clone
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schindelin
A
dd a
H
OWT
O
fo
r
setting up a
s
tan
d
al
o
n
e git dae
m
on
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schinde
l
i
n
xdiff/xutils
.
c
(
xdl_hash_record)
:
factor out whitespace
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-14
Johannes Schindelin
Do not o
u
tput "GEN " when g
e
nerating perl
.
mak
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-12
Johannes
S
chind
e
l
in
git-b
u
ndle:
o
nly die i
f
pack would
b
e
empty
,
warn if
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Jo
h
an
n
es Schi
n
delin
git-bundle: pre
v
ent
o
verwriting ex
i
s
ting
bund
l
es
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johann
e
s Sch
i
ndelin
g
i
t-bundle: di
e
if a gi
v
en ref is not
included in
b
und
l
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes Schindelin
g
i
t
-bund
l
e: ha
n
dle
thin p
a
cks in
s
ubcommand "unb
u
ndle"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Johan
n
es S
c
hindeli
n
g
it
-
bundle: Make thin packs
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Johannes Schindelin
git-b
u
ndle: avoid p
a
c
k
ing objects which a
r
e
i
n the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
J
ohannes Schin
d
el
i
n
bund
l
e
:
f
ix
wrong check of read_header
(
)'s return value
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johann
e
s
Schindelin
m
a
k
e
t8001 work on Mac OS X again
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johan
n
e
s
Sch
i
ndelin
B
egin Submi
t
ti
n
gPatches with a check list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Schin
d
elin
format-patch
:
add --inline
option an
d
mak
e
--attach
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes
S
chindelin
c
h
e
r
ry-pick
:
Su
g
g
e
st a better
method to
r
etain
authorship
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schind
e
lin
Get
rid of
t
h
e
dependency
to G
N
U
diff in the
t
ests
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Jo
h
a
n
nes Schind
e
l
i
n
diff --no-index: support /de
v
/null
as filename
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schindeli
n
d
i
f
f: support r
e
ading a file fr
o
m stdin vi
a
"
-
"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johan
n
es S
c
hindeli
n
Make git-revert & gi
t
-cherry-pick a builtin
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johan
n
es Schindelin
Document the
c
o
n
f
ig
v
ariable
f
o
rmat
.
suffix
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-03
Johannes Schindeli
n
builtin-arch
i
ve: use RU
N
_
S
ETUP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-02
J
ohannes
Schindelin
pr
i
nt_wr
a
pped_text: fix outp
u
t fo
r
negative indent
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johannes Schind
e
lin
f
etch
.
o depends on the h
e
ade
r
s, to
o
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johann
e
s Sc
h
in
d
elin
diff
:
m
a
ke m
o
re cases implici
t
-
-no-index
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Johannes S
c
hindeli
n
show
_
date(): r
e
nam
e
the "relati
v
e
"
parameter to
"mode"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Johannes Schindelin
Actually mak
e
print_wrappe
d
_
text() useful
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-26
Johannes Schindeli
n
diff --no-index: also
i
mit
a
te the e
x
it stat
u
s of diff(1)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-25
Johannes Schin
d
elin
Fi
x
typo: do not
s
h
ow nam
e
1
when name2 fails
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johannes Schindelin
ob
j
ec
t
n
a
me: int
r
oduc
e
':/
<
one
l
ine prefix>' not
a
tion
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johannes
S
chindelin
Fixup no-progress for fe
t
ch & clone
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
J
ohannes Sch
i
n
delin
g
i
t
-
b
u
ndle: re
c
ord comm
i
t
s
u
mmary in the prerequisite
.
.
.
commit
|
commitdiff
|
tree
2007-02-23
Johannes Sc
h
indelin
g
it-bun
d
le: fix 'cr
e
ate --all
'
commit
|
commitdiff
|
tree
2007-02-23
Johanne
s
Schin
d
el
i
n
git-b
u
ndle: avoid fork() in verify_bundle()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes S
c
hindelin
g
i
t-
b
un
d
le: assor
t
ed fixes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes S
c
hi
n
del
i
n
Add g
i
t-b
u
ndle: move objects and references by
archive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
J
ohannes Schind
e
lin
Make tests inde
p
endent
o
f global config files
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindelin
git-diff:
fi
x
co
m
bin
e
d diff
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johan
n
es Schindelin
pretty-formats: add 'format:
<
string>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Jo
h
ann
e
s Schindeli
n
Teac
h
git-d
i
ff-files the new opti
o
n `--no-index`
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
J
oh
a
nnes Schindelin
apply: make
-
-verbose a little m
o
re useful
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johannes Schindelin
Teach
d
iff -B a
b
o
ut
colours
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johannes Schindel
i
n
git grep:
u
s
e pager
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johan
n
es
S
chindel
i
n
config:
r
ead system-
w
i
d
e defaults
from /etc/g
i
tconfig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
J
ohan
n
e
s
Schindelin
fet
c
h &
clone: do not
output progress whe
n
not on a t
t
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johan
n
es S
c
hind
e
lin
rev
-
list
-
-m
a
x-a
g
e, --max-count: support --bounda
r
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johan
n
es Sch
i
ndelin
name-rev: avoid
"^0" when
u
nneeded
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes Sch
i
ndelin
a
p
ply: fix memor
y
leak in prefix_one()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-18
Joh
a
nne
s
Schindelin
diff
--ch
e
ck:
u
s
e
c
olo
u
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-17
Johannes Schin
d
elin
name
-
r
ev
:
introduce the --
r
efs=<pa
t
ter
n
>
option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-14
Jo
h
a
n
ne
s
Schindelin
teach d
i
ff machi
n
e
r
y about --ignore-spa
c
e
-
at-eol
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-13
Johannes Sc
h
ind
e
li
n
g
i
t
-gc: run pa
c
k-refs by def
a
ult unle
s
s the
repo is
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes
S
chindelin
l
og --reflo
g
: use d
w
im_log
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schindelin
fo
r
ma
t
-patch -n: make sorting
e
asier by padding nu
m
be
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Sc
h
i
n
delin
log --reflog: honour --relat
i
ve-date
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johann
e
s
S
c
h
ind
e
l
i
n
for_each_
r
eflog_en
t
: be forgiving abo
u
t mi
s
sing message
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-07
Johannes S
c
hind
e
l
in
fast-import
:
Fix com
p
ile warning
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-05
Johannes Schindelin
C
ommands requiring a wo
r
k tree mu
s
t
n
o
t run i
n
G
IT_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johannes
Sc
h
indelin
Update the docume
n
tation for the new '@{
.
.
.
}' syntax
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
J
o
hannes Schi
n
delin
Te
a
ch
th
e
'
@{
.
.
.
}' notation to git-log -g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
J
ohannes
Sc
h
indeli
n
reflog inspection
:
introduce
shortcut
"
-
g"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johan
n
es Schindelin
annotat
e
: u
s
e
pag
e
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindelin
Teach revision machinery about --rev
e
r
s
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nnes
Schindelin
-
-
walk-refl
o
g
s
: d
o
not crash with cyclic reflog ancestry
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindelin
--w
a
lk-reflogs: actually
f
ind the right
c
o
m
m
it by d
a
te
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joha
n
nes Schi
n
d
e
l
i
n
--walk-re
f
l
o
g
s: disallow unin
t
eresti
n
g commits
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindel
i
n
Teach
the rev
i
sion walker to
w
a
lk by reflo
g
s
w
ith
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindelin
Do n
o
t verify
f
ilename
s
in a bare r
e
pository
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
ohannes Sc
h
indelin
a
p
p
ly --
c
ached: fix cra
s
h in subdirecto
r
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nnes Schindelin
show_date(): fix r
e
la
t
ive dates
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-20
Johannes Schi
n
delin
co
n
f
i
g
_
set_multivar(): dis
a
llow newli
n
es in key
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-16
Johannes Schindelin
Fix spuri
o
us compile
error
commit
|
commitdiff
|
tree
2007-01-10
Johannes
S
c
h
indelin
Fix t1
4
1
0 for core
.
filemode==fa
l
se
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-09
J
o
h
annes Schindel
i
n
Saniti
z
e for_ea
c
h_reflog_e
n
t()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-31
Johannes Schindeli
n
Fix yet ano
t
her subt
l
e
xdl_merge
(
) bug
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-28
Joha
n
nes Schindelin
x
d
l_merge(): f
i
x a
segm
e
ntation fault
when refining
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-24
Johannes Schindelin
commit-tree
:
e
n
cour
a
g
e
UTF-8 commit messages
.
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
M
a
ke git-rerer
e
a bu
i
ltin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
e
s Schi
n
delin
Add a test f
o
r g
i
t-rerere
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
ohannes Schi
n
delin
mo
v
e read_mmf
i
le
(
) i
n
to xdiff-interfa
c
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
o
hann
e
s Schindelin
git
-
reset --hard:
t
ell the user what the HEAD was reset to
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
n
n
e
s Schindelin
git-tag
:
support -F <
f
i
le> option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Jo
h
annes
S
ch
i
ndelin
U
s
e
g
it-merge-fi
l
e in git-merg
e
-one-file, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schind
e
l
i
n
diff --che
c
k: fix off
b
y one er
r
or
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-19
J
o
hannes S
c
h
i
ndelin
I
n
troduce GIT_TEMPLATE_DI
R
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindelin
git-branc
h
:
re
n
ame confi
g
va
r
s
b
ranc
h
.
<branch>
.
*, to
o
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johan
n
es Schindelin
add a
function to rename sec
t
ions in
t
h
e
config
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes S
c
h
indelin
Document
g
it-merge-file
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johan
n
e
s Schindelin
g
it-show: grok blobs
,
trees
and
t
ags, t
o
o
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johanne
s
Sc
h
indeli
n
IN
S
TALL: n
o
nee
d
to have GNU diff
i
nstalled
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
J
o
hannes Sch
i
ndelin
merge-rec
u
rs
i
ve: add/add really is m
o
d
i
fy/modif
y
w
i
t
h
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johann
e
s Schindelin
Get rid of th
e
dep
e
n
de
n
cy on
R
CS' m
e
rge
p
r
og
r
am
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schindelin
m
erge-file: support -p and -q; fix
c
ompi
l
e warning
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes
Schindelin
Add builtin merg
e
-fi
l
e, a m
i
nimal
re
p
lac
e
ment for RCS
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
J
ohannes
Schindelin
cvs-mig
r
ation 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 Schindelin
xd
l
_m
e
rge():
f
ix and
s
implify conflict handling
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Jo
h
ann
e
s Schindelin
d
i
f
f
-b: ignor
e
w
hites
p
a
c
e at
e
nd of lin
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-04
Jo
h
annes Schindel
i
n
git-mv:
search more
precisely for sour
c
e directory
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next