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 Schin
d
elin
d
i
r
.
c(common_prefix): Fix two bu
g
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-28
Johannes Schinde
l
i
n
t4118: be nice to non-GNU sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-24
Johannes Sc
h
indelin
git-r
e
vert: Revert revert messa
g
e to old behaviou
r
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-23
Johannes Schinde
l
in
t4118: b
e
nice t
o
non-GNU sed
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes
Schindelin
Provide some technical
d
ocumenta
t
io
n
f
o
r shallow clones
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schindelin
Add a
H
OWTO fo
r
setting up a stan
d
alone git daemon
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schindelin
xdiff/xutils
.
c(xd
l
_hash_record
)
: fa
c
to
r
o
ut whitespace
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-14
Johanne
s
Schindelin
Do not output "
G
E
N
"
when
ge
n
er
a
t
i
ng p
e
rl
.
mak
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-12
Joha
n
nes Schindelin
g
it-bundle: only die if pack would be empty, warn if
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Joh
a
nnes Schi
n
delin
git
-
b
u
ndle: preve
n
t over
w
riting existing
bundl
e
s
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
Johannes Schind
e
lin
git-bu
n
dle: d
i
e if
a
g
i
ven r
e
f is not included in b
u
ndle
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-09
J
oh
a
nnes Schindelin
git-b
u
n
d
le:
handle thi
n
packs in subcomman
d
"unbundle"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
Jo
h
annes Schindelin
gi
t
-bundle
:
Make thin packs
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-08
J
ohannes Schi
n
d
elin
git-
b
undle: avoid
p
acking ob
j
e
c
ts which a
r
e in
the
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johannes Schi
n
delin
bundle: fix
w
rong
c
h
eck of read_header()'s re
t
urn value
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-07
Johan
n
es Schin
d
elin
mak
e
t8001
wor
k
on Mac
O
S
X again
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Schinde
l
i
n
Begin
S
ubmittingPatches w
i
th a ch
e
ck list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-05
Johannes Schind
e
lin
f
o
rmat-patch: add
-
-inli
n
e op
t
ion
and make --att
a
c
h
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes
S
c
hindelin
cherry-pick: Sugge
s
t a better met
h
od
to retain au
t
horship
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
J
o
hannes Schindelin
Get
rid
o
f the dependency
to
G
NU diff in the
t
ests
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Joh
a
nnes Schindelin
dif
f
--no-index: support
/dev/nul
l
as f
i
lena
m
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Jo
h
a
nn
e
s Schindelin
d
i
ff: s
u
pport reading
a
file from stdin v
i
a
"-"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schindelin
Make git
-
revert & git-cherry-pick a buil
t
in
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-04
Johanne
s
S
chindel
i
n
D
o
cument t
h
e config variable
for
m
a
t
.
s
uffix
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-03
Jo
h
annes Sc
h
indelin
b
uiltin-arc
h
ive: use RU
N
_SETUP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-02
Johannes Sch
i
ndelin
print_wr
a
pped_text
:
fix out
p
ut for
neg
a
tive indent
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johan
n
es Schindel
i
n
fetch
.
o d
e
pe
n
d
s on
t
he headers, too
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-03-01
Johannes Sch
i
ndeli
n
diff: m
a
ke more cases implicit --no-index
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Joha
n
nes Schindelin
show
_
d
ate(): renam
e
th
e
"relativ
e
" parameter to "
m
ode"
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-28
Johannes Schind
e
lin
Actually mak
e
print_wr
a
pped_
t
ext() usefu
l
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-26
Jo
h
annes Schindeli
n
diff
--no
-
in
d
ex
:
also imitate the exit statu
s
of diff(1)
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-25
J
o
hannes Schindel
i
n
F
i
x typo: do
not show
name1 when name2 fails
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Johannes
S
ch
i
ndelin
object name: introduce ':/<oneline prefix>
'
notation
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-24
Jo
h
anne
s
Schi
n
delin
Fix
u
p no-progress for fetch
&
cl
o
n
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes
S
chindelin
git-bundle: r
e
cord
commit summar
y
in the
prer
e
quisite
.
.
.
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schin
d
elin
git-
b
undle:
f
i
x 'crea
t
e
--
a
ll
'
commit
|
commitdiff
|
tree
2007-02-23
Joh
a
nnes Sc
h
inde
l
in
g
i
t-bundle: av
o
i
d
f
o
rk(
)
in v
e
rif
y
_bun
d
le()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindelin
git-bund
l
e
:
assort
e
d
f
ixes
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
J
oh
a
nnes Schindelin
Add git-
b
und
l
e: m
o
ve
objects and references b
y
arch
i
v
e
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Sch
i
ndelin
Mak
e
tests independent of global conf
i
g file
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johanne
s
Schindeli
n
git-d
i
ff: fix combined d
i
ff
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schinde
l
in
pr
e
tty-for
m
ats: add 'fo
r
mat:<
s
tring>'
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindelin
Teach
g
i
t-diff-files the ne
w
option `--n
o
-index
`
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-23
Johannes Schindelin
apply:
mak
e
--verbos
e
a
little mo
r
e useful
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
Johannes Schindelin
Teac
h
diff -B about colours
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-21
J
o
hannes Schindeli
n
git grep: use pager
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johannes Schinde
l
in
config:
read
s
ystem-wide
d
e
f
aults from /etc/gitconfig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
J
o
hannes Sch
i
ndelin
fetch & clone:
do not output pr
o
gres
s
when not on a
t
ty
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Joha
n
ne
s
Schindelin
re
v
-list
-
-max
-
age, -
-
max-c
o
unt:
su
p
por
t
--boundary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Joha
n
nes Schindelin
name
-
rev
:
avoid "^0" w
h
en unneeded
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-20
Johann
e
s Schindelin
ap
p
ly: fix memor
y
leak in
p
refix
_
o
n
e()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-18
Johannes Schinde
l
in
diff --check: use colour
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-17
J
o
h
a
nnes Schindelin
name
-
rev
:
introd
u
ce th
e
--refs=<p
a
ttern> op
t
ion
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-14
J
oh
a
nnes Schin
d
elin
teach di
f
f machinery abo
u
t --
i
gnore-space-a
t
-eol
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-13
Johannes Schindelin
g
i
t-gc: run pack-refs
b
y default unless the repo is
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schindelin
log --reflog: use dwim
_
log
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
J
o
h
a
n
nes Schin
d
elin
format-
p
atch -n: make sorting easi
e
r by paddi
n
g number
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Sch
i
nd
e
lin
lo
g
--refl
o
g:
h
onour --r
e
lative-date
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-09
Johannes Schindeli
n
for_
e
a
c
h_reflo
g
_ent
:
be forgiving
about missing message
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-07
J
ohann
e
s Schindel
i
n
fas
t
-imp
o
r
t:
F
ix co
m
pile warnings
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-05
Johannes Schindel
i
n
Commands requiring a work tree must not run in GIT_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
Johannes Sc
h
indelin
Upda
t
e the documentation for the new '@{
.
.
.
}
'
syntax
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-02-02
J
ohannes
Sch
i
ndelin
Teach t
h
e
'@{
.
.
.
}'
nota
t
ion to git-log -g
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Johannes Schindelin
reflo
g
i
nspect
i
on: i
n
tr
o
duce shor
t
cut "
-
g"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-24
Jo
h
a
nnes Schindelin
annotate
:
u
se pager
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindeli
n
Teac
h
revision
m
a
c
hinery about -
-
r
everse
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johan
n
es Schindelin
-
-
walk-re
f
logs: do not
crash
w
ith cyclic reflo
g
ancest
r
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
hannes Schi
n
delin
--walk-ref
l
ogs: actu
a
lly find th
e
r
i
ght co
m
mit by da
t
e
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schinde
l
in
--walk-re
f
log
s
: disallow unin
t
e
r
estin
g
c
o
mmits
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
o
hannes Schin
d
e
l
in
Teac
h
th
e
revisio
n
w
alker to
w
a
l
k by r
e
flo
g
s with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Sch
i
nd
e
lin
Do not ver
i
fy filenames in
a
b
are
r
e
p
ository
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
J
ohannes Schindelin
a
p
ply --cached: fix
crash in subdirectory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
n
nes Sch
i
nd
e
l
i
n
show_d
a
te()
:
fix relative dates
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-20
Johanne
s
Schindeli
n
config_set_multi
v
a
r(): disallow newlines in keys
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-16
Joha
n
nes S
c
h
i
nd
e
lin
Fix spur
i
ous compile err
o
r
commit
|
commitdiff
|
tree
2007-01-10
Joh
a
nnes Schindeli
n
Fix t1410 for core
.
fi
l
emode==false
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2007-01-09
Joh
a
nnes Schinde
l
in
Sanitize for_each_
r
eflog_ent()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-31
Johan
n
es
Schindelin
Fix yet another subtle xdl_merge() bug
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-28
Johannes Sc
h
indelin
x
dl_merge(): fix a
s
egment
a
t
ion fault when
r
efining
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-24
Johanne
s
Sc
h
i
ndelin
commi
t
-tree: encourage UTF-8 co
m
mit messages
.
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schind
e
li
n
Make
git-re
r
e
re
a
b
u
il
t
in
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
J
o
h
a
nnes Schinde
l
in
Add a t
e
st for git
-
rere
r
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes S
c
hi
n
delin
move rea
d
_mm
f
ile() in
t
o
xdif
f
-
interface
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
nnes Schinde
l
in
git-r
e
set -
-
h
ard: te
l
l
the user wh
a
t the
HEAD was
reset to
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
git-tag:
support -F
<
file> opt
i
on
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Johannes
Schi
n
de
l
in
U
s
e
git-merge-
f
ile in gi
t
-merge-one-file, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-22
Joha
n
nes Schindelin
diff -
-
check: fix off by one error
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-19
Johannes Schin
d
elin
In
t
r
o
duce GI
T
_T
E
M
P
LATE_DIR
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindeli
n
git-branch:
rename config vars
bran
c
h
.
<branch>
.
*, too
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Joh
a
nnes
S
c
hindelin
add a
f
u
n
ction to ren
a
me sections i
n
the config
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schinde
l
in
Document git-merge-file
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
J
oh
a
nn
e
s Schindelin
git
-
sh
o
w: grok blob
s
, trees and t
a
gs, too
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-14
Johannes Schindelin
I
N
STALL: n
o
need
t
o
have GNU d
i
ff ins
t
all
e
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johannes
S
chindelin
merg
e
-recur
s
i
ve: add/
a
dd really is modify/modi
f
y with
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-13
Johannes Schindelin
Get rid of the de
p
endency o
n
R
C
S' merge program
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
J
o
hanne
s
Schindeli
n
merge-file:
s
u
pport -p
a
nd -q; fix compile
warnings
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes
Schindelin
Add b
u
iltin
merg
e
-file
,
a
minim
a
l replacement for
R
CS
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Sch
i
ndelin
cv
s
-m
i
g
r
atio
n
document: make
t
h
e n
e
ed fo
r
"push" more
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Schindelin
xdl_me
r
ge(): fix and simplify co
n
flict h
a
nd
l
ing
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Schi
n
d
elin
diff -
b
: ignore whi
t
espace at
end of line
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next