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
builtin-merge.c: Fix option parsing
2008-07-20
M
iche
l
e
Ball
a
bio
builtin
-
m
erge
.
c: Fix option parsi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os Vajna
Teach
'
git merge' that s
o
me me
r
ge
s
trategi
e
s
no
l
onger
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Lars Noschinski
cvsse
r
ver: Add testsui
t
e
for packed re
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio
C
H
a
m
a
no
Get
t
ing clos
e
r
to 1
.
6
.
0-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
Merge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2008-07-19
Alexan
d
er
Gavrilov
Sup
p
ort gi
t
li
n
k
s
in
f
ast-import
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Haman
o
.
mailmap updat
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
P
etr Ba
u
dis
Documentation/git-merge
.
t
x
t: Partial rewrite of How
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
archive: r
e
move
unu
s
ed heade
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
R
e
n
é
Scharfe
archive: m
a
ke zip compression level
i
n
d
ependent from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Documentation: Ho
w
to ignore local changes
i
n
tr
a
cked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudi
s
Documentation/
g
it-subm
o
d
ule
.
txt: Furt
h
er cl
a
rify the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Peter
H
a
rris
Add
A
NSI control co
d
e
emulation for the
W
in
d
ows
c
onsole
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Jo
h
annes Sixt
builtin-clone: re
w
r
ite
g
uess_dir_name(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Eric Ra
i
ble
Teach lookup_prog not
to
select directo
r
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fab
i
an Emmes
t
e
stsuite for
cvs
co -c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
L
a
r
s Noschinski
cvsse
r
ver: Add cvs co -c support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lars Noschinski
cvsserver: Add support for packed refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabian
Emmes
Te
s
ts
u
ite:
U
n
set CVS_SERV
E
R
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
S
t
e
p
h
an
B
e
ye
r
Link git-s
h
ell only to a subset of libgit
.
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio
C
Hamano
t900
1
(send-e
m
a
i
l
):
Do not use har
d
coded /
b
in/sh in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Ju
n
io C H
a
m
an
o
GIT
1
.
5
.
6
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Oliv
i
er
Marin
builtin-rm:
f
i
x
in
d
ex lock file path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio
C
Hamano
Merge
b
ranch 'sp/
m
aint-index-pack' int
o
maint
commit
|
commitdiff
|
tree
2008-07-18
Junio
C
H
a
mano
http-fetc
h
: do no
t
S
E
GV
a
fter
f
etching a
bad pack idx
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Ju
n
io C Hamano
rev-
l
ist: honor --quie
t
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Hamano
builtin-remot
e
.
c
:
fix
e
arlier
"
ski
p
_
pr
e
fix()" conversion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
S
t
e
p
han Beyer
api-run-comm
a
nd
.
txt: typof
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Docum
e
ntation/RelNot
e
s-1
.
6
.
0
.
txt: Expand on
the incompatible
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Hamano
mailinfo
:
off-by-one fix for [P
A
T
C
H
(fooba
r
)] removal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C Hamano
read-cache
.
c: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
Updat
e
d
r
aft release notes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
M
erge branch 'mv
/
das
h
less'
commit
|
commitdiff
|
tree
2008-07-17
J
u
nio C Hamano
Merge b
r
a
nc
h
'
l
s/mailinfo'
commit
|
commitdiff
|
tree
2008-07-17
Petr Bau
d
is
Doc
u
mentatio
n
/
g
it-
s
ub
m
o
dule
.
t
xt: Add Description sec
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C Hamano
Merge
branch
'sb
/
d
ashle
s
s'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merg
e
branch 'rs/
a
rchive'
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o
C
H
a
mano
Merge branch 'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
J
unio C Ha
m
ano
M
e
rg
e
branch 'rs/rebase
-
checko
u
t-n
o
t
-
so-q
u
iet'
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C Hamano
Merge branch 'sp/main
t
-index
-
pack'
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Ha
m
ano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
am
a
no
Start preparing 1
.
5
.
6
.
4 release no
t
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johann
e
s
Schindelin
g
it
f
etch-p
a
ck:
do not
comp
l
ain
about
"no common commits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hama
n
o
Merge branch 'js/main
t
-pretty-m
a
i
lmap' into maint
commit
|
commitdiff
|
tree
2008-07-16
J
uni
o
C Hamano
Merge br
a
nch 'sp/
m
ai
n
t
-bash
-
completio
n
-optim' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
J
unio C Hamano
Merge branch 'sp/maint-pack-m
e
m
use
'
into main
t
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch
'ls/
m
aint-mailinfo-patch-
l
a
bel' i
n
to
maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'js/
m
ai
n
t-daemon-syslog' into maint
commit
|
commitdiff
|
tree
2008-07-16
Stephan
B
eyer
rebase-i
:
ke
e
p old
parents when preserving m
e
r
ges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
J
ohann
e
s Sixt
t
7
600
-
merg
e
: Use test_expect_failure t
o
test option
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Po
t
apo
v
Fix buffe
r
overflow in
p
repare_att
r
_st
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dm
i
try Po
t
a
pov
Fix buffe
r
overflo
w
in git diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
D
mitry Pot
a
pov
Fix
b
u
f
f
e
r overflo
w
in
git-
g
r
e
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
SungHyun Nam
t/Makef
i
le
:
use sp
e
cified shell when
r
unning aggregation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Lar
s
Noschinski
git-cvsserver: fix call to
non
e
xista
n
t cleanupWorkDir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako
S
hi
r
aish
i
parse-opti
o
ns
.
c: make chec
k
_typos() sta
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
N
a
nako Shir
a
ishi
buil
t
in-describe
.
c: ma
k
e a global
va
r
iable "pattern
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Na
n
ako Shirai
s
hi
c
a
che-tre
e
.
c: ma
k
e cache_tr
e
e_fi
n
d() stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
P
etr Baud
i
s
Documentation/git-cherry-p
i
c
k
.
txt et al
.
: Fix misleading
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
amano
t/ag
g
rega
t
e-re
s
ults: whitespace fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Er
i
c Wong
t/lib-git-svn: fix SVN_HTTPD tests to work
w
ith "tras
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C H
a
mano
Merge
b
ranch 'mv
/
m
e
rg
e
-
in-c
'
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
a
m
ano
Mer
g
e
b
ranc
h
'ag/re
w
rite_one'
commit
|
commitdiff
|
tree
2008-07-16
J
unio C Hamano
M
erge branch 'sp
/
win
'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'js/more-win'
commit
|
commitdiff
|
tree
2008-07-16
J
u
n
i
o
C
Hamano
Merge branch 'js/ma
i
nt-pretty-mailmap'
commit
|
commitdiff
|
tree
2008-07-16
Johannes Schindel
i
n
Rename "
.
dotest/"
t
o "
.
git/rebase" and "
.
dote
s
t-m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Al
e
xand
e
r
G
avrilov
Do
n
o
t try to
detect m
o
v
e
/copy for entries bel
o
w thres
h
old
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavri
l
ov
Av
o
id resca
n
ning uncha
n
ge
d
entrie
s
in search for
copies
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C
Hamano
Update draf
t
rele
a
se n
o
tes to
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Joh
a
nnes S
c
h
i
ndel
i
n
shortl
o
g: supp
o
rt -
-
p
retty=
f
o
r
mat: op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
C
iara
n
McCreesh
Mak
e
git
-
add -i ac
c
ept
r
anges li
k
e 7-
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Pavel Rosk
i
n
t9600: allow testing with cv
s
ps 2
.
2, in
c
l
udi
n
g beta
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René
S
charfe
archive: remo
v
e
extra arguments parsing code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
R
e
né Schar
f
e
archive
:
uni
f
y
file
attrib
u
te h
a
ndling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René
S
charfe
archive:
c
entralize arch
i
ve
e
ntry writi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Schar
f
e
archive: add b
a
se
l
en
member to struct archiver_args
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Sc
h
arfe
add cont
e
xt pointer
to read_t
r
ee_recursive()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Re
n
é Scharfe
archiv
e
:
remove args
member from str
u
ct arch
i
ve
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Sha
w
n O
.
Pearce
ind
e
x-pack: Hon
o
r core
.
d
e
ltaB
a
seCach
e
Limit when re
s
o
l
ving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index
-
pack:
Track the object_en
t
ry that creates ea
c
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
i
n
d
e
x-pack: Chain the
s
truct base_data o
n
the stack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
S
hawn O
.
Pearce
index-pac
k
: Refactor base arguments of
resolve_delta
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio
C Ha
m
ano
M
erge git:/
/
repo
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
Hamano
M
erge
branch '
j
s/merge-rr'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Ha
m
ano
Merge branc
h
'sb/
r
er
e
re-lib'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge branch 'ls/maint-mailinfo-p
a
tch-label'
commit
|
commitdiff
|
tree
2008-07-15
J
un
i
o C
H
amano
Mer
g
e branch
'om/rere
r
e-caref
u
l'
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C Ham
a
no
Merge br
a
nch 'jc/bran
c
h-mer
g
ed'
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C H
a
m
a
no
Merge
b
ranch
'
jc/rebas
e
-
o
rig-
h
ead'
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
bash co
m
pl
e
t
i
on: Remove
d
ashed
c
omm
a
nd completion support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hama
n
o
Merge branch 'sp/mai
n
t-bash-completion-optim'
commit
|
commitdiff
|
tree
2008-07-15
Ni
c
o
l
as Pit
r
e
restore legacy behavior for
r
ead_
s
h
a1_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Teemu Likonen
bash: Add long
o
ption complet
i
on for 'git send-email'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark L
e
vedah
l
git-submod
u
le - re
g
i
s
t
er submo
d
ule URL i
f
adding in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark Lev
e
dahl
git-submodule -
m
ake "submodule add" m
o
re
s
tri
c
t, and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Frederik
S
c
h
w
a
rzer
git-s
v
n: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
João Abecasis
git-s
v
n
:
find-rev and rebase for
S
V
N
::Mir
r
or reposit
o
r
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
tutor
i
al:
clarify "pull" is "fet
c
h
+
merge"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
I
an Katz
tutoria
l
: use prompt wi
t
h user n
a
mes in example, to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next