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
reduce_heads(): protect from duplicate input
2008-07-14
Junio C
Hamano
reduce_h
e
ads(): protec
t
from duplicate input
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Sverre
Hvamm
e
n Johansen
reduce_h
e
ad
s
():
t
hi
n
kof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
Add a new test
for git-merge-resolve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
t6021:
a
dd
a n
e
w test for git
-
merge-r
e
s
o
l
ve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Junio C Hamano
Tea
c
h
m
e
r
g
e
.
log
t
o "git
-
merge" again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-08
M
iklos Vajna
Build
i
n merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
Fix t7601-merge-
p
ull-config
.
sh on
AIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commi
t
-tre
e
: make it usable from other builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new te
s
t ca
s
e
t
o e
n
su
r
e gi
t
-merge prepends
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os Vajn
a
Add new test cas
e
t
o
ensur
e
git-me
r
g
e
reduces o
c
t
opus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Ju
n
i
o
C Hamano
I
n
troduce r
e
d
u
ce_heads(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio C
H
amano
I
ntroduce get_merge_b
a
ses_many()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add ne
w
te
s
t to
e
nsu
r
e git-merge handles more t
h
an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Introduce get_octopus_merge_bases
(
)
i
n c
o
mmit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
Vajna
gi
t
-fmt-merge-msg: make
i
t usable from other builti
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os Vajna
Move read_cache_unmer
g
ed() to
r
ea
d
-
c
ache
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new
t
e
st to ensure git-merge
h
andles p
u
ll
.
twoh
e
a
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move pa
r
se-options'
s
skip_prefix() to git-compat-u
t
i
l
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove commit_list_count
(
) to commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
split_cmdline() to alias
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hama
n
o
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2008-06-30
Brian G
e
r
nhardt
Add test
re
s
u
l
ts directory to t/
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
doc/rev-p
a
r
se: cla
r
ify reflo
g
v
s
-
-until f
o
r specifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jun
i
o C
H
ama
n
o
Update draft rele
a
s
e
notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jrnieder@
u
chi
c
ago
.
e
du
Do
c
um
e
ntati
o
n:
don't a
s
sume git-sh-setup a
n
d
g
it-
p
arse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C
Ham
a
no
t97
0
0
:
skip
whe
n
Test::More is not avail
a
bl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
J
u
nio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-06-29
Eric W
o
n
g
g
i
t-svn: d
o
n'
t
saniti
z
e
re
m
ote name
s
in config
Junio C Hamano
wrote in <7vfxr23s6m.fsf@gitster...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Oliv
i
er Marin
show_
s
t
ats
(
): fix stats wi
d
th calculatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier
M
a
r
i
n
Docum
e
ntati
o
n:
remove {show,wh
a
t
ch
a
ng
e
d
}
.
d
i
fftree config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery
Penna
r
un
git-svn: av
o
i
d
f
il
l
ing
up
t
he dis
k
with temp files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Björn Steinbrink
git cat-
f
ile: Fix memor
y
leak
i
n b
a
tch
m
ode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joey Hess
fi
x
git
config example syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Jochen Voss
avo
i
d
o
ff-by-on
e
e
r
r
o
r in run_upload_archive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
L
ea Wi
e
mann
G
IT-VERSION-GEN: do no
t
fa
i
l i
f
a 'HEAD' f
i
le ex
i
sts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Johannes Schindelin
commit-tree: lift com
p
let
e
ly arbitrary limit of
16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Dmitry Potapov
shrink gi
t
-shell by avoiding
r
edu
n
dant dependen
c
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Christi
a
n C
o
uder
help: check early
i
f we have a
c
ommand, if no
t
try
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
u
n
io C
H
a
m
a
no
D
o
cument th
e
double-dash "rev --
p
ath
"
disambiguator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
T
ed
P
erc
i
val
Don
'
t use dash c
o
mmands (git-foo) in
t
ut
o
ria
l
-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
L
ea Wie
m
ann
test-lib
.
sh:
s
how git init
o
utput when in v
e
rbos
e
mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C
Hamano
M
e
rge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ha
m
a
no
Merg
e
b
r
anch
'
m
a
int-1
.
5
.
5' i
n
to maint
commit
|
commitdiff
|
tree
2008-06-27
Ju
n
io C
H
aman
o
GIT 1
.
5
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Merge branch '
m
aint-1
.
5
.
4'
i
nto
maint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Junio
C
H
a
ma
n
o
GI
T
1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
g
i
t-she
l
l: acc
e
pt "git foo" form
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
diff
-
-chec
k
: do not
di
s
ca
r
d error
status upon
seeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jeff King
improve for
-
eac
h
-ref tes
t
script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jing
X
ue
Add 'git-p4
.
al
l
o
wSubmi
t
' to git-p4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C
Hamano
S
tart draft rele
a
se n
o
tes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dmi
t
ry Potapov
update-hook-example: optionally all
o
w non-
f
a
s
t-forward
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Alex Ri
e
sen
Fix use of "per
l
-i
"
on Wind
o
ws
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C
Hamano
G
IT
1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Hama
n
o
Merge
b
r
anch 's
b
/rebase'
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
i
o C
Hamano
Merg
e
branch 'lw/g
i
tweb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C H
a
mano
Merge
b
ranch '
l
t/co
n
fig-f
s
ync'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hama
n
o
Merg
e
branch 'sr
/
tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge
b
ranch 'jh/clone-packed-refs'
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io C
H
amano
M
e
r
ge branch 'lw/perlish'
commit
|
commitdiff
|
tree
2008-06-25
Dmitry Potapov
f
i
x up
d
a
te-hook-example to
w
ork with pa
c
ked
t
ag r
e
feren
c
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jef
f
King
cl
o
n
e
:
create intermedi
a
te di
r
ectorie
s
of
destinat
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Haman
o
Merge b
r
anch 'jc/mai
n
t-combine-diff-pre-context' into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
M
e
rge branch 'lt/m
a
int-gi
t
dir-relative' into maint
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch 'sb/maint
-
reba
s
e
'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
for-each-ref: imp
l
ement missing
t
ag values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pi
t
re
ver
i
fy-pac
k
: test for detection
o
f in
d
ex v2 object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicol
a
s
Pitre
ver
i
f
y
-pac
k
: check packed
o
bje
c
t
CRC when using index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicol
a
s
Pi
t
re
mov
e
show_p
a
ck_info()
w
here it belongs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas P
i
tre
opti
m
iz
e
verify-pa
c
k a bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
clone: create inter
m
ediate di
r
ectories of de
s
tination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
io C Hamano
Ship s
a
mple hooks
w
ith
.
sample s
u
ff
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C Hamano
p
re
-
rebase hook
u
pdate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
N
i
colas Pitre
refa
c
tor pack structure
al
l
oc
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicola
s
P
itre
t
est case
f
or p
a
c
k re
s
ilience
against corruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nic
o
las Pitre
imple
m
e
n
t s
o
me resilience agai
n
st pac
k
corru
p
t
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nic
o
las Pitre
ca
l
l init_pack_revindex(
)
l
azily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Junio
C
H
a
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-24
Jan Krüger
git-svn: make rebuild respect rew
r
i
teRoo
t
o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Patrick Higg
i
ns
Workar
o
und for AIX
mkstemp
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
M
i
chele Ballabio
t9301-f
a
st-e
x
por
t
.
sh: Re
m
o
v
e
debug li
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Linus Torvalds
Shrink the gi
t
bin
a
ry
a bit
by avoiding unn
e
c
e
ssary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beye
r
Ext
e
nd par
s
e-options test suite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan
B
eyer
api-
p
a
rse-options
.
txt: Introduce
d
ocumentation for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Mic
h
ele Ballab
i
o
parse-optio
n
s
.
c
:
f
ix documentation s
y
ntax of optional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
api
-
b
uiltin
.
txt: update and fix typ
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
S
tephan Beyer
git-rebase
.
sh: Add
che
c
k
if rebas
e
is in pr
o
gress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
St
e
p
han Bey
e
r
t3404: stricter tests for git
-
rebase--inter
a
ctiv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
a
p
i
-bui
l
ti
n
.
t
x
t:
up
d
ate and
f
ix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
a
mano
Merge branch 'rs/archive-ign
o
re'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io
C Hamano
Merge br
a
nch 'lt/
r
acy-empty'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
erge b
r
a
n
ch
'
s
n
/s
t
atic'
commit
|
commitdiff
|
tree
2008-06-22
Junio C H
a
mano
Merge b
r
a
nch 'jc/
m
aint-combine-diff-pre-
c
onte
x
t'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge
b
ra
n
c
h
'lt
/
m
a
int-g
i
tdir-relative'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'jk/test'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C H
a
m
a
no
Merg
e
branc
h
'p
b
/
f
a
s
t
-export'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C Hama
n
o
Merge branch 'mo/
s
tatus
-
untracked'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Haman
o
Merge
b
ranch 'kh/update-r
e
f
'
commit
|
commitdiff
|
tree
next