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-27
Alex
a
ndre
Jul
l
iard
git
.
el: Displ
a
y some
i
nformation about the HEAD com
m
it
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-03-19
Alexandre Julliard
git
.
el: Add support for commit h
o
o
k
s
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-03-11
Alex
a
nd
r
e
Julliard
git
.
e
l
: Retr
i
eve com
m
it
l
og info
r
mation fr
o
m
.
dotest
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-03-11
Alexandre
J
ull
i
a
r
d
git
.
el: A
v
oid appending a sig
n
off li
n
e t
h
at is alre
a
dy
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-02-28
Al
e
xandr
e
Julliard
git
.
el:
Set the d
e
fault commit coding s
y
s
tem from the
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-02-14
Alexandre J
u
lliard
sha1_fi
l
e
.
c:
R
ound
the mmap
o
f
fset to half the window
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-02-14
A
lexandre Jull
i
a
rd
g
it-daem
o
n:
A
void leaking th
e
lis
t
ening socke
t
s int
o
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-02-11
Al
e
xandre Julliard
dif
f
.
c: More logical file name quoting for r
e
names
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-02-11
Al
e
xandre Julliard
d
iff
.
c: P
r
operly quot
e
fi
l
e names in di
f
f
--summary
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-02-11
Alexandre Julliard
diff
.
c: Reuse the ppri
n
t_ren
a
me function f
o
r diff
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-01-26
Alexa
n
dre Julli
a
rd
vc-git
.
el: T
a
k
e into acc
o
u
n
t the de
s
tination
n
a
me in
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-01-10
Alexandre Jull
i
a
r
d
git
.
el:
D
efine the propertize func
t
i
o
n i
f
ne
e
d
ed, for
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-01-10
Alex
a
ndre Jull
i
a
r
d
git-clone: Make sure
t
he
m
a
ster branch exis
t
s
b
efore
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-01-10
A
l
exandre Julliard
git-apply: Remove direc
t
o
ries
t
ha
t
have become e
m
pty
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-01-06
Alexandre Ju
l
l
i
ard
git
.
el:
Avoid
s
e
t
ting fo
n
t lock keywords before
e
ntering
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-01-06
Alexandre Julliard
git
.
el: Don't u
s
e -
-
i
n
f
o-only when reso
l
ving a fi
l
e
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2007-01-06
Alexand
r
e Jull
i
ar
d
git-clean: Fix the -q option
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-12-23
A
l
exandr
e
Julliard
vc-git: Ignore
errors
ca
u
sed
by a non-exist
e
nt
di
r
e
ctory
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-24
Alexandre
J
u
lli
a
rd
fe
t
ch
-
p
ack: Do not fet
c
h tags for shallow clones
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-24
Al
e
xandre Julli
a
rd
get_shallow_commits: Avoid me
m
ory leak if a commit
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-24
A
l
exan
d
re J
u
lliard
git-fetch: Reset shallow_depth before auto-following
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-24
Alexandre Jull
i
ard
upload-
p
a
c
k:
Check for N
O
T
_
SH
A
LLOW fla
g
before sending
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-24
A
l
e
x
a
n
dre Jul
l
iard
fetch
-
pa
c
k: Properly remove t
h
e
s
hallow f
i
le when it
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-24
Alexandre Jull
i
ar
d
Shallow clo
n
e: do not ignore s
h
a
l
lowness w
h
en followin
g
.
.
.
commit
|
commitdiff
|
tree
2006-11-15
Ale
x
andre Julliard
gitweb: Put bac
k
s
h
or
t
log instead
of graphiclog in
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-04
A
l
exandre Jul
l
iard
g
i
t
.
el: In
c
lude MERG
E
_
M
S
G
i
n the lo
g
-
e
d
it buffer even
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-04
Alexandre
J
ulliard
git
.
el: M
o
ve point afte
r
th
e
log message h
e
ader when
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-04
Alexandr
e
Ju
l
liard
git
.
el: Added a function t
o
o
pen the cu
r
rent f
i
le
i
n
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-04
Alexandre
J
ulliard
g
i
t
.
el: Added functions for moving t
o
the
n
e
x
t/p
r
ev
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-11-03
Al
e
xandre Jul
l
iard
p
ack-ref
s
:
Store the
full na
m
e of the ref even when
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-10-23
Alex
a
ndre Julliard
pr
u
ne-packed:
Fi
x
un
i
nitialize
d
variable
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-10-05
Alexandre Julliard
vc-g
i
t
.
el
:
S
w
itch to using git
-
bl
a
m
e instead of git
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-10-05
Alex
a
n
d
re
Julliard
gi
t
.
e
l: F
i
xed inverted "
r
ena
m
ed from/to" message
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-07-24
A
lexandre
J
ulliar
d
show-branch: Fix a
n
othe
r
perform
a
nce proble
m
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-07-24
Alexandre Julli
a
rd
git
.
el:
Put the
g
it custom
i
ze gro
u
p
i
n
the
'
t
o
o
ls'
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-07-24
Alexandre Julliard
g
it
.
el
:
Try
t
o
reuse an existing buf
f
er wh
e
n r
u
nning
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-07-24
A
l
exandre
Julliar
d
git
.
el: Prepend a sla
s
h
t
o the file name when
a
dding
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-07-24
Alexandr
e
Julliard
gi
t
.
el: Run git-rerere
o
n
commits if the
rr
-
cache directory
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-19
Alexandre Julliard
gi
t
.
el:
A
dded a function
to
diff agains
t
the
o
ther
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-19
A
lexandre Ju
l
liard
gi
t
.
el: Get the de
f
ault use
r
n
a
m
e and
e
mail from the
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-19
Alexan
d
re
J
ulliard
git
.
el: Mo
r
e robust
h
andling of subprocess e
r
rors when
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-18
Alexan
d
re Ju
l
liard
ls-file
s
:
D
on
'
t require exclude files to end wit
h
a
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-04
A
lexandre Julliard
git
.
e
l: Added customize sup
p
ort for all
p
arameters
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-04
Alexandre Julliar
d
git
.
el:
A
d
de
d
s
u
ppo
r
t for Sign
e
d-off-by
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-04
Alexandre J
u
lliard
git
.
el: Automatical
l
y update
.
git
i
gno
r
e status
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-04
Alexandre J
u
lliard
g
i
t
.
el:
Se
t
default direc
t
ory be
f
ore running
th
e
status
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-04
Alexandre
J
u
lliard
git
.
el: Portabil
i
ty fixes for XEmacs and Emac
s
C
VS
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-03-04
Alex
a
ndre Julli
a
rd
contri
b
/
e
m
acs:
Add
an Emacs VC backend
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-02-27
A
lex
a
ndre Julliard
gi
t
-f
o
rma
t
-p
a
tch: Always add a
blank line
b
e
t
ween headers
.
.
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree
2006-02-18
A
l
exandre J
u
l
liard
Add
an Emacs interfa
c
e
i
n
co
n
trib
.
Signed-off-by:
Alexandre Julliard
<julliard@winehq.org>
commit
|
commitdiff
|
tree