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
t6021: add a new test for git-merge-resolve
2008-07-13
Miklos Vajna
t60
2
1: add a new te
s
t for git-merge-resolve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
J
u
n
i
o C Hamano
T
each merge
.
log to "git
-
mer
g
e" again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los Vajna
Build in merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajn
a
Fix t7601-
m
erge-pu
l
l-c
o
n
f
ig
.
sh
o
n AIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os
Vajna
gi
t
-com
m
it-tree
:
m
ake it usa
b
le from
other builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add ne
w
test case to ensure git-m
e
rge prepends the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los V
a
jna
Add new test case to ensure git-merg
e
r
educes octopus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio
C
Hamano
Introd
u
ce
r
e
duce_heads()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Introduce get_merge_bas
e
s_many(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vaj
n
a
Ad
d
n
e
w test to ensure git-
m
erge handles more than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Intro
d
uce get_octopus_merge_base
s
(
)
in commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: ma
k
e
it usable from oth
e
r b
u
ilt
i
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os
Vajna
Move
r
e
ad
_
cache_
u
nmerged() to
read-cache
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
lo
s
Vajna
Add new t
e
st to e
n
s
ure g
i
t-merge ha
n
dles pull
.
t
w
o
h
e
a
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve par
s
e-o
p
tions's skip_prefix() to git-
c
o
m
pat-util
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move commit_list_count() t
o
c
o
mmit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vaj
n
a
Move split_cmdline() to al
i
as
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jun
i
o C
H
amano
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-06-30
B
rian Gernhardt
A
dd t
e
st r
e
su
l
ts direct
o
ry to t/
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
eff
King
d
o
c/rev-parse: c
l
arif
y
reflog vs
--u
n
til for
s
pe
c
ifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Update draft release notes
f
or 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jrnie
d
e
r
@uchicago
.
edu
Documenta
t
ion: don't as
s
u
m
e
g
it-sh-setu
p
and git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
t9700: skip wh
e
n Test::More is no
t
ava
i
lable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
J
un
i
o
C
Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-29
E
r
ic Wong
git-svn: do
n
't s
a
nitize rem
o
t
e nam
e
s in confi
g
Junio C Hamano
wrote in <7vfxr23s6m.fsf@gitster...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Mari
n
s
h
ow_stats(): f
i
x
sta
t
s width calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier
M
arin
Doc
u
mentation: remove
{sh
o
w,wha
t
c
ha
n
g
ed}
.
difftree
con
f
ig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery P
e
nnarun
git-s
v
n:
a
void filling up the disk with temp files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
B
jörn Steinbrink
git c
a
t
-file: Fi
x
mem
o
ry leak in
b
atch mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joey Hess
fix git c
o
nfig examp
l
e
sy
n
tax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Jo
c
he
n
Voss
a
v
oid o
f
f
-b
y
-on
e
er
r
or
i
n run_
u
pload_a
r
chi
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wie
m
ann
GIT-VERSION-GE
N
:
d
o not fail
i
f a 'H
E
AD'
f
ile e
x
i
s
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
J
ohanne
s
Schindelin
commit-tree: li
f
t compl
e
tely arbitrary
l
imit of 16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Dmitry Potapov
shrink gi
t
-shell by avo
i
ding red
u
nda
n
t de
p
endencies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
C
h
r
ist
i
an Cou
d
e
r
h
e
lp:
c
h
e
c
k early i
f
we have a com
m
and,
if not try
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C
H
a
m
ano
Document t
h
e double-dash "rev
-- path" disambigu
a
t
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Ted Percival
D
on'
t
us
e
d
a
sh commands (
g
it-f
o
o
)
in tutoria
l
-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Lea Wiema
n
n
test-lib
.
sh:
sh
o
w g
i
t init output
w
he
n
in ver
b
o
s
e mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C Hamano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-06-27
Ju
n
io C Hamano
Me
r
ge branch 'maint-1
.
5
.
5' into
m
ai
n
t
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
GIT 1
.
5
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hama
n
o
Merge branch 'maint-1
.
5
.
4' into main
t
-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
J
uni
o
C
H
a
m
ano
G
I
T 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Ha
m
ano
gi
t
-shell:
accept
"
git foo" form
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
diff --check: do
n
ot disc
a
rd er
r
or sta
t
us upon see
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
eff
K
i
ng
improv
e
for-each-ref tes
t
scr
i
pt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Ji
n
g Xue
Ad
d
'git-p4
.
a
l
lowSu
b
mit
'
to gi
t
-p4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio
C Hamano
Start draft releas
e
note
s
f
or 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dm
i
tr
y
Potapov
update-hook-exampl
e
: opt
i
onally allow non
-
fast-forward
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
unio C
Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Alex Riesen
F
i
x
u
se o
f
"
p
erl -i"
o
n
W
i
nd
o
w
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
u
nio C Hamano
GIT 1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge b
r
a
nc
h
'
s
b
/
rebase'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Haman
o
Merge bran
c
h 'lw
/
gitweb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C
H
aman
o
Merg
e
br
a
nch 'l
t
/config
-
f
s
ync
'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Ham
a
no
Merge branc
h
'sr/t
e
s
t
s'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C Hamano
Merge bra
n
ch '
j
h/clo
n
e-p
a
cked
-
r
e
f
s'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch 'lw/pe
r
l
ish'
commit
|
commitdiff
|
tree
2008-06-25
Dmitry Potapov
fi
x
u
p
d
a
te-hook-e
x
ample to work with p
a
cke
d
tag re
f
erences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
clone: create inte
r
medi
a
te
d
irectories of de
s
tina
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hama
n
o
Merg
e
branch 'jc/
m
ai
n
t-combine-dif
f
-pre-conte
x
t
' into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch 'lt/maint-gitdir-relative' into maint
commit
|
commitdiff
|
tree
2008-06-25
J
un
i
o
C
Hamano
M
e
rge br
a
nch 'sb/maint-
r
ebase' into maint
commit
|
commitdiff
|
tree
2008-06-25
Jeff
Kin
g
for-each
-
r
e
f
: im
p
lement missing
tag val
u
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
verify-pack
:
test
f
or detection of index v2
o
bj
e
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ni
c
olas Pitre
verify-pack: check pa
c
ke
d
ob
j
ect CRC when usin
g
index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
N
i
colas Pi
t
re
move
show_pa
c
k_inf
o
() wher
e
it be
l
ongs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas P
i
tre
op
t
imize verify-
p
ack a bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
c
lone: create intermediat
e
dir
e
ctories of
d
estination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Ha
m
ano
Shi
p
sample hooks
w
ith
.
sample suffi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
pre-rebase hook
update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicola
s
Pitre
refactor
pack
s
t
r
u
c
t
ure
allo
c
a
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
test case
for
p
a
c
k res
i
lience agai
n
s
t
co
r
ruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
N
i
c
olas
Pitre
implemen
t
some re
s
ilience
aga
i
nst
p
ack corruptio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
call
i
nit_pack_
r
evindex() l
a
zily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Jun
i
o
C
H
amano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-24
J
a
n Krü
g
er
git-sv
n
: make
r
eb
u
ild res
p
ect rewriteRoot optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Pat
r
ick Higgins
W
orkaround f
o
r AIX mkste
m
p
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Mic
h
ele Ballabio
t93
0
1-fast-exp
o
rt
.
s
h
: Rem
o
ve
debug line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Li
n
us Torval
d
s
Shrink
t
h
e gi
t
bina
r
y a bit
b
y avoiding unnecessary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
J
uni
o
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-06-23
St
e
phan Beyer
Extend parse
-
options test suite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
a
pi
-
parse-op
t
ions
.
t
x
t: Introd
u
ce
d
ocumentati
o
n for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
M
i
chel
e
Ballabio
parse
-
optio
n
s
.
c:
f
i
x documentation syntax o
f
optional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
S
te
p
h
an Beyer
api-builtin
.
t
xt
:
upd
a
te and fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Ste
p
han Beyer
g
i
t-rebase
.
sh:
Add che
c
k if rebase is i
n
progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
St
e
phan Beyer
t3404: str
i
cter tests fo
r
git-r
e
b
as
e
--int
e
ractive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
St
e
phan Beye
r
api-builtin
.
txt: update and fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Hama
n
o
Merge branch 'rs/arch
i
ve-ignor
e
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Ha
m
ano
Mer
g
e
branch 'lt/racy-emp
t
y'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'sn/static'
commit
|
commitdiff
|
tree
2008-06-22
Jun
i
o C
Hamano
Merge branch
'
jc/ma
i
nt
-
combine-diff-pr
e
-context'
commit
|
commitdiff
|
tree
2008-06-22
J
uni
o
C
H
amano
Merge
branch 'l
t
/m
a
i
n
t
-gitdir-relative
'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Hamano
M
erge bra
n
ch 'jk/tes
t
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hama
n
o
M
e
rge branch 'pb/fa
s
t-e
x
p
ort'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C Hamano
Merge branch 'mo/status-untracked
'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Haman
o
Merg
e
branch 'k
h
/upd
a
te
-
ref
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch
'
jn/
w
e
b
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'rg/gitw
e
b'
commit
|
commitdiff
|
tree
2008-06-21
Shawn O
.
Pearc
e
Correct
d
ocu
m
entation for git-p
u
s
h --mirror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next