repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Keep rename/rename conflicts of intermediate merges while doing recursive merge
2007-03-28
Johanne
s
S
c
h
indelin
t4118: be
nice to non-GNU sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-24
Johannes Schindelin
git-rev
e
rt: Re
v
ert revert messag
e
t
o
o
l
d beha
v
iou
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-23
J
ohanne
s
Schindelin
t4118: be ni
c
e to non-GNU
s
ed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
J
oh
a
n
nes Sc
h
indel
i
n
Provide s
o
me te
c
hn
i
cal documentation for
shallow clone
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes S
c
hindelin
A
dd
a
HOWTO for se
t
t
ing u
p
a standalone
git daemo
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Joh
a
nnes Schin
d
elin
xdi
f
f
/
xutils
.
c(xdl_h
a
s
h
_re
c
ord): factor o
u
t whitespace
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-14
Johannes Schindelin
Do n
o
t o
u
t
p
ut
"
GEN "
when generatin
g
p
e
r
l
.
mak
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-12
Johannes Schindelin
git-bundle: on
l
y
d
ie if
pack would be empty,
w
arn if
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes Sc
h
inde
l
in
git-bundle: pre
v
ent
o
verw
r
it
i
ng existing
bundles
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes
S
chinde
l
in
g
i
t-b
u
ndl
e
: die i
f
a gi
v
en
ref is not included in bundle
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes Sc
h
in
d
elin
gi
t
-bundle: h
a
ndle thin p
a
cks in
s
u
bcommand "unbundle"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Joh
a
nn
e
s Sc
h
indel
i
n
git-
b
und
l
e: Make t
h
i
n
p
acks
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Johannes Schindelin
git
-
bundle:
a
vo
i
d pa
c
k
i
ng objects which
a
re in the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
J
oh
a
nnes
S
chin
d
elin
bundle: fix wrong check of re
a
d_hea
d
er()
'
s re
t
urn v
a
lue
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johanne
s
Schinde
l
in
m
ake 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
Johanne
s
Schindelin
Be
g
in SubmittingPatches with
a check list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Schindelin
for
m
at-patch:
add
--inline option a
n
d make
--attach
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johanne
s
Schindelin
cherry-pi
c
k: Sugge
s
t a better method
to retai
n
authorship
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Joh
a
nnes S
c
hinde
l
in
Ge
t
rid of
the dependency to
G
NU di
f
f in the tests
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Joh
a
nnes
Schi
n
delin
d
i
f
f
--no-index: support
/
dev/
n
ull as filename
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes
Sch
i
n
delin
diff: support r
e
ad
i
ng a file
f
rom
s
td
i
n via "
-
"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
J
o
h
annes Schindeli
n
M
a
ke
g
i
t
-revert & git-cherry-pick a builti
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johan
n
es Schindeli
n
Document t
h
e config variable format
.
s
uffix
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-03
Johan
n
es Sc
h
indelin
bui
l
tin-archive
:
u
s
e
RU
N
_SETUP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-02
J
o
h
a
nnes Schinde
l
in
print_wrapped_
t
ext: fix output for n
e
gative in
d
ent
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johannes Sc
h
indelin
fet
c
h
.
o
d
e
pends on
the hea
d
e
r
s, to
o
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johannes Schindel
i
n
diff: make more ca
s
es i
m
pli
c
it -
-
no-
i
ndex
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Johannes Schin
d
e
li
n
show_
d
a
te(
)
: renam
e
the "relative" par
a
m
eter to "mode
"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Joh
a
nnes S
c
hindelin
Ac
t
u
a
lly make print_wrapped_text()
u
sef
u
l
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-26
Johannes
S
chindelin
diff --no-inde
x
: also imitate t
h
e
exit status of diff(1)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-25
Jo
h
annes Schindelin
Fix t
y
p
o:
do no
t
show
n
ame
1
when name2 fa
i
ls
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johanne
s
S
chindelin
object name: i
n
troduc
e
'
:/<onel
i
n
e
prefix>' notatio
n
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johannes S
c
hindelin
Fi
x
up
n
o-prog
r
ess
for fe
t
ch & c
l
one
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Sch
i
n
deli
n
git-bundle: record
c
ommit summary in the prereq
u
isite
.
.
.
commit
|
commitdiff
|
tree
2007-02-23
J
o
h
annes Schindelin
g
it-bundle
:
fix 'create --all'
commit
|
commitdiff
|
tree
2007-02-23
Joha
n
nes Sch
i
nde
l
i
n
gi
t
-bundle: avo
i
d
fork() in ver
i
fy_bundle()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes S
c
hindeli
n
git-bundle: assorted fixes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johanne
s
Schindelin
Add git-
b
undle: mo
v
e o
b
ject
s
and refe
r
ences by archive
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
J
o
h
annes Sc
h
i
n
delin
Make tests independent
o
f g
l
ob
a
l c
o
nfig files
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Joha
n
nes Schindelin
gi
t
-dif
f
: fix combined diff
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes
Schindelin
pret
t
y
-fo
r
mats: add 'format:<string>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schin
d
e
l
in
Teach gi
t
-diff-file
s
the new option
`
--no-index`
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johanne
s
Sc
h
i
n
deli
n
a
p
pl
y
: make --verbo
s
e a little mor
e
u
s
eful
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johan
n
es Sc
h
indelin
Teach diff -B
a
b
out colours
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
J
o
hannes
S
chindelin
git grep: use
p
ager
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Joh
a
nnes
Schindel
i
n
config: read syst
e
m-wide defaults
f
rom /etc/gitconfig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
J
ohannes Schindelin
fetch & clone: do
n
ot output progress when not on a
tty
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
J
ohannes Schindelin
rev-list --max-age, --ma
x
-count: su
p
po
r
t --boundary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Jo
h
annes S
c
hi
n
delin
name-rev: av
o
id "^0" w
h
en unneeded
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johan
n
es Schindelin
app
l
y:
f
ix memor
y
leak in prefix_
o
ne()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-18
J
ohannes Schindelin
diff -
-
ch
e
ck
:
use colour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-17
Johannes Schin
d
elin
n
ame-re
v
: introduce the --refs=<pattern> o
p
tion
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-14
Johan
n
es Schindelin
teach diff machi
n
er
y
about --ignore-s
p
ac
e
-at-eol
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-13
Johann
e
s Schindelin
git-gc: run pack-r
e
fs by defau
l
t unle
s
s the
repo is
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Joh
a
nnes Schind
e
lin
log --r
e
flog: u
s
e dwim_log
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schindelin
form
a
t
-patch
-
n
:
make
s
or
t
ing ea
s
ier by pad
d
ing number
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schindelin
log --reflog
:
ho
n
o
ur --rel
a
tive-date
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schindel
i
n
for_each_re
f
l
o
g
_ent:
b
e
forg
i
v
ing
a
bou
t
missing message
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-07
Johann
e
s Schindel
i
n
fas
t
-import: Fix compil
e
warni
n
g
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-05
Johannes Schi
n
delin
Com
m
ands
requiring a work tr
e
e
m
ust not run in GIT_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johannes Schindelin
Update th
e
documentation for the n
e
w '@{
.
.
.
}
'
syntax
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Joh
a
nnes Schi
n
delin
Teach the '@{
.
.
.
}' notatio
n
to git-log -g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johannes Schi
n
d
elin
reflog
in
s
p
ection: i
n
tr
o
duce shortcut "-g"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Joh
a
n
nes Sch
i
ndel
i
n
annotate: use pager
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
h
annes Schi
n
delin
Teach revision m
a
chinery about --reverse
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Jo
h
a
nne
s
S
c
hindelin
--walk-re
f
logs: do
not
crash with cyc
l
ic
r
eflog
a
n
c
estry
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schi
n
d
e
lin
-
-
walk-r
e
f
l
o
g
s:
a
ctually fi
n
d t
h
e right co
m
mit by
date
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johan
n
e
s
Schindelin
--walk-reflogs: disallow uninterestin
g
c
ommits
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johan
n
es Schindelin
Te
a
c
h the
r
evision walk
e
r t
o
walk
by reflogs with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
hannes Sc
h
indelin
Do not verify filename
s
in a bare
r
epository
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
ohannes
S
c
h
i
nd
e
lin
apply --cached: fix
crash
in subd
i
rectory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Jo
h
annes Schindelin
s
ho
w
_date()
:
fix relative dat
e
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-20
Johannes Schindelin
config_set_multivar(): disal
l
ow newlines in k
e
ys
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-16
Johanne
s
Schindelin
Fix spurious co
m
pi
l
e error
commit
|
commitdiff
|
tree
2007-01-10
Johannes Schindelin
F
i
x t1410 for core
.
f
i
lemode==false
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-09
J
ohannes
S
chindelin
Sanitize for_
e
ach_reflog_en
t
()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-31
Johann
e
s Schindelin
Fix
y
et another
subtle x
d
l_merge() b
u
g
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-28
Johann
e
s Schindelin
x
d
l
_
m
erge()
:
fix a
segmentatio
n
fault when refining
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-24
J
o
ha
n
n
es Schind
e
lin
commi
t
-tree: encourage
UTF-8 co
m
mit messag
e
s
.
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schind
e
lin
Make git-r
e
rere
a builtin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
o
hanne
s
Schindelin
Add a test
for git-
r
erere
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
o
hannes Schindelin
move
r
ead_
m
mfile() into x
d
iff-interfac
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
ohannes Schindelin
git-reset --hard: tell the user what the HEAD was
rese
t
to
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Sch
i
ndelin
git
-
tag:
suppo
r
t -F <fi
l
e
>
option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
ohannes Schindelin
U
s
e git-merge-file in git-merge-on
e
-file, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
di
f
f -
-
check
:
f
i
x
off by
one err
o
r
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-19
J
o
hannes Schin
d
elin
In
t
roduce GIT_TE
M
P
L
AT
E
_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schin
d
e
l
in
git-branch: r
e
n
ame config
vars branch
.
<branch>
.
*, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johann
e
s Schindelin
add a fun
c
tion
t
o rename s
e
ctio
n
s in t
h
e c
o
n
fig
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johan
n
es
S
chin
d
elin
D
o
c
u
men
t
g
i
t
-merge-file
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes Schindeli
n
git-show: grok blobs, t
r
ee
s
and tags,
t
oo
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Joh
a
nnes Schindelin
INSTALL:
no need to have GNU diff i
n
st
a
lled
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johannes Schindelin
m
e
rg
e
-recursive: ad
d
/add really i
s
modify/m
o
dify with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johannes Schindelin
G
e
t ri
d
o
f the depend
e
n
cy on RCS' mer
g
e program
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schind
e
lin
merg
e
-file: sup
p
o
rt -p and
-
q; fix c
o
m
p
ile
warnings
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
J
o
h
a
nne
s
Sch
i
n
d
elin
Add builtin m
e
r
g
e-fi
l
e, a minim
a
l re
p
l
acement for RC
S
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
J
ohann
e
s Schindelin
cv
s
-migration document:
make the need for "p
u
sh" more
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Jo
h
a
n
nes Sch
i
n
del
i
n
xdl
_
merge(): fix and
si
m
plify con
f
lict handli
n
g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Johanne
s
Sch
i
ndelin
d
i
ff
-b: ig
n
ore wh
i
tespace at end of li
n
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-04
Joh
a
nnes Sch
i
nd
e
l
i
n
git-mv:
search mor
e
p
r
ecisely for source directo
r
y
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next