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
t7601: extend the 'merge picks up the best result' test
2008-07-23
Miklos Vajna
t7
6
0
1: extend the 'merge picks up the best result'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Danie
l
Barkalo
w
In perforce, RCS keywords are case
-
sensit
i
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Alex Riesen
Allow pager of
dif
f
comma
n
d
b
e
ena
b
led/disabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Joh
a
nnes
Schindelin
Fix two
l
e
ftovers fr
o
m path
_
list-
>
s
t
ri
n
g_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivi
e
r
Marin
g
i
t am --skip: clean
t
he index wh
i
l
e
p
reserv
i
ng local
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pierre Hab
o
uzi
t
g
i
t-submodule: mov
e
ill placed sh
i
ft
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
P
i
erre Habouzit
builtin-merge: a
d
d
missing structure
initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
V
ajna
buil
t
in-
m
erge: give a proper error
message
for inv
a
lid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Junio C Hamano
test
s
:
d
o
not rely on external
"
patch"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Nik
o
laj S
c
h
umacher
D
on't cut
o
f
f
l
a
st character of
commit descr
i
ption
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
par
s
e
-
options
:
f
i
x
segmentation
fau
l
t
w
hen a required
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Philip
p
e
Bruhat
.
.
.
maili
n
fo: better parse emai
l
adresses
containg
parenthe
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Marin
g
i
t-am: remove dash
f
rom help messa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
u
n
io C
Hamano
Revert "make gi
t
-s
t
a
tus use a pager"
commit
|
commitdiff
|
tree
2008-07-22
Jonathan Nieder
git
-
di
f
f(1):
"--c" -> "
-
-
c
c" typo fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johannes Sc
h
indelin
Rename pa
t
h_li
s
t
t
o
string_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
J
ohannes
S
chi
n
delin
Rename
.
git
/
rebase to
.
git
/
rebase-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio
C Hamano
Update m
y
e-ma
i
l ad
d
ress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
J
unio C Ha
m
a
no
Merge branch 'ap/trackinfo'
commit
|
commitdiff
|
tree
2008-07-21
Junio
C Haman
o
Merge branc
h
'
j
c/rerere-auto-more'
commit
|
commitdiff
|
tree
2008-07-21
Junio
C
Hamano
Merge b
r
anch 'ns/a
m
-abor
t
'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
Merge branch '
j
c/add-addremo
v
e'
commit
|
commitdiff
|
tree
2008-07-21
Junio C Hamano
"nee
d
s
update" considered harmful
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Junio C Ham
a
no
Move read_in_full() an
d
write_in_ful
l
() to wrappe
r
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Jun
i
o C Ham
a
no
Link shell with co
m
pa
t
lay
e
r
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-21
Juni
o
C H
a
mano
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2008-07-20
Dmitry Potapov
git-svn: fix
git
svn info
t
o wor
k
witho
u
t arg
u
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
M
i
chele Ballabio
builtin
-
push
.
c: Cleanup - use
O
P
T
_
BIT() and remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
M
ichele Ball
a
bio
builti
n
-mer
g
e
.
c: F
i
x optio
n
p
a
rsin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Jonathan
N
i
e
der
fix usage st
r
ing
for git gr
e
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Miklos V
a
j
na
Teach 'git merge' that some m
e
rge str
a
t
eg
i
es no l
o
nger
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Lars Nosch
i
ns
k
i
c
vsserver: Add testsuit
e
for packed r
e
fs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio
C
Hamano
refresh-index: fix bit
m
a
sk assignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Ju
n
io
C
Hamano
g
i
t-add --a
l
l
:
d
ocumen
t
a
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio
C Ha
m
ano
git-add --all: tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Haman
o
git-add --all:
add all
f
iles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-20
Junio C Hamano
builtin
-
add
.
c: restruc
t
ure th
e
cod
e
f
o
r
m
aint
a
i
n
abilit
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Juni
o
C Hamano
G
e
t
ting close
r
to 1
.
6
.
0
-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
N
a
nako Shi
r
aishi
git
a
m --abort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Jun
i
o C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-07-19
Alex
a
nder
G
avr
i
l
o
v
Support
gitlinks
in fast-import
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
.
mailmap update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudi
s
Documenta
t
ion/git-merge
.
txt: Partial
r
e
write of
How
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
archive: re
m
o
v
e
unused he
a
d
e
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Ren
é
Scharfe
arc
h
ive: make zip compres
s
ion level
i
ndep
e
nden
t
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
P
etr Baudis
Documentati
o
n
:
H
o
w to ignore local chan
g
es i
n
tracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Petr
B
a
udis
Documentation/
g
it-submodu
l
e
.
txt: Fu
r
ther clarify
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Pe
t
er Harris
Add ANSI contro
l
c
od
e
e
m
ulation for the Wind
o
ws console
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Johannes Sixt
builtin-clone
:
rewrite gues
s
_
d
ir_name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
E
r
ic Raible
Teach lookup_pro
g
n
ot to s
e
lec
t
director
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Emmes
testsuite
fo
r
cvs co -c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Lars Noschi
n
ski
cvs
s
e
r
ver: Ad
d
cvs
co -c suppo
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
La
r
s
No
s
chi
n
s
ki
cv
s
server: Add suppor
t
for p
a
cked re
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Fabi
a
n Emmes
Tests
u
ite: Unset CVS_SERVER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Step
h
an Beye
r
L
i
nk git-
s
hell only to a subset
o
f
l
ibgit
.
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio
C
Ha
m
ano
t
9
001
(
send-email): D
o
not use
h
ardcoded /bin/sh in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
GIT 1
.
5
.
6
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-19
Olivier M
a
rin
b
u
iltin-rm: fix index loc
k
file
p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio
C
Hamano
Merge branch 'sp/maint
-
index-pack' into maint
commit
|
commitdiff
|
tree
2008-07-18
J
u
nio C H
a
ma
n
o
http-fetch:
d
o not SEGV after fetchi
n
g a bad pac
k
idx
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
rev-list:
h
onor --quiet
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Juni
o
C Hama
n
o
builtin
-
r
e
mote
.
c: f
i
x earli
e
r "sk
i
p_prefix(
)
" conv
e
rsion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-18
Stephan
B
e
yer
api-run-command
.
txt: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Docu
m
entation
/
R
e
l
Notes
-
1
.
6
.
0
.
txt: Exp
a
nd on
the incompa
t
ible
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
rerere
.
auto
u
p
d
a
t
e: chan
g
e
th
e
message
w
h
en
autoupda
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C
Hamano
mailinfo: of
f
-
b
y-
o
ne fix for
[PATCH (fooba
r
)] re
m
o
v
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
io
C
H
a
man
o
r
e
ad-cache
.
c: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
io C Hamano
Update
d
raft rel
e
ase not
e
s for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Avery Pen
n
arun
Reword
"
y
o
ur branch has
dive
r
ge
d
.
.
.
" l
i
nes to
r
educ
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C Hama
n
o
Merge branch 'mv/
d
as
h
less'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merg
e
branch 'ls/
m
ail
i
nfo'
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Docume
n
tation/g
i
t-
s
ubmodule
.
tx
t
: A
d
d Descript
i
on s
e
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Me
r
ge branch 'sb/da
s
hle
s
s'
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C
H
am
a
no
M
er
g
e branch 'rs/arch
i
ve'
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Ham
a
no
Merg
e
branch
'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge branch '
r
s/rebase-checkout-not-
s
o-qu
i
et'
commit
|
commitdiff
|
tree
2008-07-17
J
unio C Haman
o
Me
r
ge
b
ranch 'sp/m
a
int-index-pack'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
Merge
b
r
an
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-07-16
J
un
i
o C Hama
n
o
Start p
r
eparin
g
1
.
5
.
6
.
4 rel
e
ase not
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
o
ha
n
n
es Schindelin
git fetch-pack: do no
t
co
m
pl
a
in about
"no
c
o
mmon commit
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Haman
o
Merge branch 'j
s
/maint-pretty-mailmap' into
m
aint
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio
C
Hamano
Me
r
g
e
branch 's
p
/
maint-bash-completion-opt
i
m' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
amano
Merg
e
branch
'
sp
/
maint-pa
c
k
-me
m
use' into
maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'l
s
/maint-m
a
ilinfo-
p
atc
h
-lab
e
l' into maint
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
i
o
C
H
a
mano
Mer
g
e branch 'js
/
m
a
int-
d
a
e
mon
-
sysl
o
g' into
m
aint
commit
|
commitdiff
|
tree
2008-07-16
Stephan Beyer
r
e
base-i: keep old paren
t
s when preser
v
i
ng merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johanne
s
Six
t
t7600-merge: Use test_expe
c
t
_failure to test option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Pota
p
o
v
F
i
x buffer overflow in
p
r
ep
a
re_a
t
tr
_
stack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmit
r
y P
o
tapov
F
ix b
u
ffe
r
o
v
erflow in
git
d
i
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Po
t
apov
Fi
x
buffer overflow in
g
it-grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
SungHyun Nam
t/Makefile: use sp
e
cifi
e
d
s
hell
when runn
i
ng aggre
g
at
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Lars Nosch
i
nski
git-cvsserver: fix cal
l
to nonexistant cleanupWorkDir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shiraishi
parse-
o
pti
o
ns
.
c: make check_typos
(
) stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shirai
s
hi
builtin-describe
.
c: make a glob
a
l variable "p
a
ttern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shiraishi
c
a
c
h
e-tree
.
c:
ma
k
e cache_tree_find() static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Petr B
a
u
d
is
Doc
u
m
entation/git-cherry-pick
.
t
x
t et al
.
: Fix mi
s
leading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
amano
t/ag
g
regate
-
r
esults:
whitespace fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Eric
W
ong
t/lib-g
i
t-svn: fix SVN
_
HTTPD
te
s
ts
t
o work with "trash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Haman
o
M
erge branch 'mv/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C
Hamano
Merge branch 'ag/rewrit
e
_o
n
e'
commit
|
commitdiff
|
tree
next