repo.or.cz
/
git
/
git-bigfiles.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Teach merge.log to "git-merge" again
2008-07-10
Junio C
H
amano
T
each merge
.
l
o
g
to "git-merge" again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
V
ajn
a
Bui
l
d
in merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
F
ix
t7601-
m
e
r
g
e
-
pull-config
.
s
h o
n
AIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
git-commit-tree: make it usable from other bui
l
tins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add
n
ew te
s
t
c
a
s
e
t
o ensure git-
m
erge prepends
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajn
a
Ad
d
ne
w
tes
t
case to
e
nsure git-merge reduces octopus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio C
H
amano
I
n
t
roduce reduce_heads(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
J
u
nio C Ham
a
no
Introd
u
ce
g
et_
m
erge_bases_many(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
dd new test to ensure git-merge
h
a
ndles
m
ore than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Introduc
e
get_octopus_merge_bases() in comm
i
t
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
V
ajna
gi
t
-fm
t
-me
r
ge-msg: mak
e
i
t
usable from
ot
h
e
r
builti
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
n
a
M
o
v
e
r
ead_cache_unme
r
ge
d
() to read
-
cach
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test to ensure git-m
e
rge han
d
les pull
.
twoh
e
ad
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Mov
e
parse-o
p
ti
o
ns's ski
p
_pre
f
i
x
(
)
to git
-
c
o
mpat
-
util
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move
commit_list_count
(
) t
o
commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move sp
l
it_cmdline()
to ali
a
s
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
u
ni
o
C
Ham
a
no
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-06-30
B
r
i
an G
e
rnhardt
A
d
d t
e
st results directory to t/
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
doc/re
v
-
p
ar
s
e: clarify
r
eflog vs
-
-until f
o
r specifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jun
i
o
C Haman
o
Update
d
ra
f
t relea
s
e notes
for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jrnieder@uchicago
.
edu
Documentation
:
don'
t
as
s
u
m
e git-sh-se
t
up and git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
unio C Hamano
t
9700: skip when
Test::More is
not availab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Junio C
Ham
a
no
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-06-29
Eric W
o
ng
git-
s
vn
:
don't sanitize remo
t
e
names in conf
i
g
Junio C Hamano
wrote in <7vfxr23s6m.fsf@gitster...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Ol
i
vier Marin
show_stats():
f
ix
s
tat
s
width calculatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Oliv
i
er Mar
i
n
Documentation: rem
o
v
e
{show,whatc
h
anged}
.
difftree confi
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery
P
en
n
arun
git-svn: avoid filling up the d
i
sk with temp files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
B
j
ö
rn Ste
i
nbrink
git ca
t
-
fil
e
:
Fix
m
em
o
r
y
leak in batch mo
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joey Hess
f
i
x git
config example syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Jochen V
o
ss
avo
i
d o
f
f-by-on
e
error
in run_upload_a
r
chive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Lea
W
iemann
GIT-
V
ERSION
-
GEN: do not fail if a 'HEAD' file exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Johannes S
c
h
i
nde
l
in
commit-tree: lift
c
omple
t
ely a
r
bitrary
l
imi
t
of 16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
D
m
itry Potapov
shrink git-
s
hell
b
y av
o
idi
n
g redundant dep
e
ndencies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Chri
s
ti
a
n Couder
help: ch
e
ck early if w
e
have a comma
n
d, if not t
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ha
m
ano
D
ocu
m
en
t
the double-dash "re
v
-
-
path"
d
isambigua
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Ted
P
ercival
Don't use
d
ash
c
o
mmands
(
g
it-foo) in tutor
i
al-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Lea
W
iema
n
n
te
s
t-lib
.
sh:
show git
i
nit outp
u
t
w
h
en in verbose m
o
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ha
m
an
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o C
H
amano
Merge
b
ran
c
h
'mai
n
t-
1
.
5
.
5'
i
nto maint
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C Hamano
GIT
1
.
5
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
M
e
rg
e
branch
'
maint-1
.
5
.
4
'
into maint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
GIT 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Juni
o
C H
a
mano
git-shell:
accept
"
g
it foo" form
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio
C
Hamano
diff --che
c
k:
do not discard error
status
upon s
e
ei
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jeff King
improve for-each-ref test s
c
r
ip
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jing
X
ue
Add
'git-
p
4
.
allowSubmi
t
' to git-p
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio
C
Hamano
S
tart draft release
n
otes for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dmitry Potapov
update-hook-example: optio
n
a
l
l
y
a
l
low non
-
f
ast-
f
or
w
ard
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
unio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Alex
R
ies
e
n
Fix
u
s
e of "per
l
-i" on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C
H
a
m
a
no
GIT 1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch 'sb/rebas
e
'
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
i
o
C Hamano
Merge
b
ranch 'lw
/
gitweb
'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch 'lt/config-fsync'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch
'
sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hama
n
o
Mer
g
e
b
ranch '
j
h/clon
e
-packed-
r
efs'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Haman
o
Mer
g
e branch
'lw
/
pe
r
lish'
commit
|
commitdiff
|
tree
2008-06-25
D
mitry P
o
tap
o
v
fix up
d
ate-hook-example
to wo
r
k
w
ith
packed tag refer
e
nce
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff
King
clo
n
e: create intermediate
d
irectories of destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
i
o
C Haman
o
Merge branc
h
'jc/maint-combine-diff-pre-co
n
text' int
o
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merg
e
branch 'l
t
/
maint-gitdir
-
r
e
lative' into maint
commit
|
commitdiff
|
tree
2008-06-25
J
unio C Hamano
Merge
branch 's
b
/maint-reb
a
se' into m
a
int
commit
|
commitdiff
|
tree
2008-06-25
J
e
ff King
for
-
each-ref
:
implement miss
i
ng tag valu
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas
P
itre
v
e
r
i
fy-pack: test for
detection of index v2
o
bject
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas
P
itre
verify-pack: che
c
k pa
c
ked
o
bject
C
R
C when using index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas
P
itre
move sh
o
w_pa
c
k_i
n
fo()
w
h
ere it
b
elongs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
opti
m
ize verify-pack a
bi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jef
f
King
clone: create in
t
ermediate directories
o
f desti
n
a
tio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Haman
o
Shi
p
samp
l
e h
o
oks with
.
sampl
e
suffix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hamano
pre-rebas
e
hook update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas P
i
tre
refact
o
r pa
c
k struc
t
ure allocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nic
o
l
a
s Pitre
test case for
p
ack r
e
s
i
lience against
c
or
r
uptio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
implemen
t
some resilience
agai
n
st pack corruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitr
e
call i
n
it_pa
c
k_revin
d
ex(
)
l
azily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
J
unio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-06-24
J
a
n Krüger
git-sv
n
:
ma
k
e rebuild res
p
ect rewriteRoo
t
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Patrick Higgins
Workaround for AIX mkste
m
p()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Michele Ballabio
t9301-fast-exp
o
rt
.
sh:
Remo
v
e debug
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Linus Torvalds
Shrink the git bi
n
ar
y
a
b
it by avo
i
d
i
ng unnecessa
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Juni
o
C Hamano
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-06-23
Ste
p
han B
e
y
er
Extend pa
r
se-options te
s
t suite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
a
p
i-parse-options
.
txt
:
In
t
roduce do
c
umenta
t
ion
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
M
i
c
h
ele Ballabio
parse-
o
pti
o
ns
.
c:
f
ix
docum
e
ntatio
n
syntax of optiona
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan
B
eyer
a
p
i-buil
t
in
.
txt: upda
t
e and fix typ
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Step
h
an Beyer
g
it
-
rebase
.
sh:
A
dd check if rebase i
s
in pr
o
gress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan
B
eyer
t3404: stricter tests fo
r
git
-
rebase--i
n
teractive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
S
t
ephan
B
eyer
api-bu
i
ltin
.
txt:
update and fi
x
ty
p
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io
C
Hamano
Merge branch 'rs/archive-ig
n
ore'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge b
r
anch 'lt/r
a
cy-emp
t
y'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Haman
o
Merge branch
'sn/static'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C
Hama
n
o
M
erg
e
branc
h
'jc/maint-
c
ombine-diff-pre-context'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'lt/maint-gitdir-relativ
e
'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C
H
amano
Merge bran
c
h 'jk/tes
t
'
commit
|
commitdiff
|
tree
2008-06-22
Jun
i
o
C
H
amano
Merg
e
branch 'pb/fast-exp
o
rt'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Hamano
Merge
branch 'mo/
s
tatus-untra
c
ked
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
e
rge b
r
anch 'kh/up
d
ate-ref'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hama
n
o
Merge
branc
h
'jn/
w
e
b'
commit
|
commitdiff
|
tree
2008-06-22
J
unio C Hamano
M
e
r
g
e branch 'rg/gitw
e
b'
commit
|
commitdiff
|
tree
2008-06-21
Sha
w
n O
.
Pe
a
r
ce
C
o
r
r
ect documentation fo
r
git-push --mirror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
Ja
k
u
b
Nareb
s
k
i
t/REA
D
ME
:
Add 'Sk
i
p
p
ing Tests' section belo
w
'Running
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next