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
Mik
l
os Vajna
t602
1
: add a new test f
o
r
g
it-merge-resolve
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-10
Ju
n
io C Ham
a
no
Teach merge
.
log to "git-merge" ag
a
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
u
i
ld in
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
Fix t7601-
m
erge-pull-config
.
sh on AIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
lo
s
Vajn
a
git-commit-tree:
m
ake
i
t usable from other builtins
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
A
dd new
test
c
a
se to ensure gi
t
-merge prep
e
nds the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
ew test
case
to ensu
r
e git-mer
g
e
reduces oc
t
opus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Juni
o
C
H
a
m
a
no
Int
r
od
u
ce red
u
ce_h
e
ads()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Jun
i
o
C Hamano
Introduce get_mer
g
e_bases_many()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test to ensure git-merge handles m
o
re t
h
an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Introduce get_octopu
s
_merg
e
_bases() in
c
omm
i
t
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os Vaj
n
a
git-fmt-
m
erge-
m
sg: ma
k
e it usable
f
rom other built
i
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cach
e
_unmerged(
)
to r
e
ad-cac
h
e
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Va
j
na
Add new test to ensure git-
m
e
r
g
e
handles
p
ull
.
t
wohe
a
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve parse-options's skip_prefix
(
)
t
o git-compat-util
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_list_count() t
o
commi
t
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move
split_cmdline() to
a
l
ias
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Ham
a
no
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-06-30
Brian Gernhardt
A
dd test re
s
ults directory to
t/
.
gitign
o
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
doc/rev-p
a
r
s
e: c
l
ari
f
y reflog
v
s
--until for
specify
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Juni
o
C H
a
mano
Upda
t
e d
r
aft release notes
for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
jrnieder@uch
i
cago
.
edu
Documen
t
ation:
do
n
't
a
ssume git-sh-setup and git-
p
arse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Juni
o
C Ha
m
ano
t97
0
0: skip
w
hen
T
est::
M
ore is not available
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Junio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-29
Eric Wong
git-
s
vn:
d
on
'
t sani
t
ize remote
names in config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Marin
s
how_stats(): fix sta
t
s width cal
c
u
l
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
O
liv
i
er
Marin
Documentation: remove {show,w
h
atchanged}
.
difftree config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Avery Pennaru
n
g
i
t-svn:
avoi
d
filling
u
p the disk w
i
t
h
temp fi
l
es
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Björn S
t
einbrink
git cat-fi
l
e: Fix memory
leak in
batch mod
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Joe
y
Hess
fix git
config exampl
e
synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Jochen
V
oss
av
o
i
d
off-by-on
e
e
r
ror in run_u
p
lo
a
d_archive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wiemann
GIT-VERSION-GE
N
: do no
t
fail if a 'H
E
AD' file
e
x
ists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Johannes Schindeli
n
commit-tree: lift completely a
r
bitrary limit
of
1
6
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Dmit
r
y
Potapov
s
h
r
ink
gi
t
-shell by avoid
i
ng r
e
dundant dependenci
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Christian Couder
hel
p
: c
h
eck
ea
r
ly if we
h
ave a comma
n
d
, if
n
o
t try
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Docu
m
ent the dou
b
l
e
-das
h
"rev -- path"
d
isambiguator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Ted Perc
i
val
Do
n
't use da
s
h com
m
ands (
g
it-foo) in tutori
a
l-2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Lea Wiemann
test-lib
.
s
h
: show git init outpu
t
w
h
e
n
in verbos
e
mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Merg
e
branc
h
'maint-1
.
5
.
5' into
maint
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o C Ha
m
ano
GIT
1
.
5
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio
C
Haman
o
Merge branc
h
'main
t
-1
.
5
.
4'
i
n
to maint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C H
a
mano
GIT 1
.
5
.
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o
C
Ham
a
no
g
i
t
-
shell: ac
c
ept "git fo
o
" form
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
diff --chec
k
:
d
o not disc
a
rd error status upon seeing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jeff Ki
n
g
improve for-each-ref test s
c
ript
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jing Xu
e
Add 'git
-
p4
.
al
l
o
w
Sub
m
i
t
'
to git-p4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C
H
ama
n
o
St
a
rt dr
a
ft release n
o
tes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Dmitr
y
Potapov
update
-
hook-ex
a
mp
l
e: optio
n
ally all
o
w non-
f
as
t
-forward
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o C Ha
m
ano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Alex Ri
e
sen
Fix use of "perl -i" on
W
indows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
J
u
nio C Ha
m
an
o
GIT 1
.
5
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
J
u
ni
o
C Ham
a
no
Mer
g
e
b
ran
c
h 'sb/rebas
e
'
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io
C
Hama
n
o
Merg
e
bra
n
ch 'lw/g
i
tweb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ham
a
n
o
M
e
rg
e
branch 'lt/config-fsync'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch 'sr/tes
t
s'
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C H
a
ma
n
o
Merge branch
'
jh/clone
-
packed-refs'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hamano
M
e
rge
b
r
a
nch
'lw/perlish'
commit
|
commitdiff
|
tree
2008-06-25
Dmitry Potapov
fix update-
h
ook-exam
p
le to work w
i
th packed t
a
g
references
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Je
f
f
King
clone
:
crea
t
e intermediate directories
o
f de
s
tinat
i
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Me
r
ge branch 'jc/main
t
-combi
n
e-diff-pre-conte
x
t' int
o
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
J
unio C Ha
m
ano
Merge branch
'
lt/maint-
g
itdir-relative' into ma
i
n
t
commit
|
commitdiff
|
tree
2008-06-25
Junio C Haman
o
Merge branch
'
sb/maint-rebas
e
' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
for-eac
h
-
r
ef: implement miss
i
ng tag value
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
N
ico
l
as Pit
r
e
verify-pack
:
test for
d
e
tection of index v2 o
b
ject
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nic
o
l
a
s Pitre
v
e
rify-pack: check packe
d
obj
e
ct CRC when using
i
ndex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
N
i
colas Pitre
move show_pack_info() where
i
t belongs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
N
icola
s
Pit
r
e
optimize verify-
p
ack a b
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Jeff Ki
n
g
clone: create int
e
r
m
ediate directori
e
s of
destinat
i
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Ship sample
hooks with
.
sample su
f
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
io C Hamano
pr
e
-rebase hook update
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas
P
itre
refactor pack structu
r
e allo
c
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
test case
f
or
p
a
ck resilience a
g
ainst corruptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicola
s
Pitre
im
p
l
e
ment some resilien
c
e agai
n
st pack c
o
r
r
uptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas P
i
tre
call in
i
t_pack_
r
ev
i
n
dex(
)
lazily
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Junio
C
H
a
mano
M
e
r
g
e bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-06-24
Jan Kr
ü
ger
g
i
t-s
v
n
:
make rebuil
d
r
e
s
pect re
w
r
i
t
eR
o
ot option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Patri
c
k
Hi
g
g
ins
W
o
rka
r
ound for AIX mkstemp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Michele Ballabio
t9301-
f
ast-export
.
sh: Rem
o
ve
d
ebug line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Linus
T
orvalds
Shri
n
k
t
he git
binary a bit by avoid
i
ng unnecess
a
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
J
unio
C
Hamano
Mer
g
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-06-23
St
e
p
h
a
n Beyer
Extend parse-options test suite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n Beyer
api-p
a
rse-options
.
txt: Introduc
e
documen
t
ati
o
n for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Mic
h
e
l
e Ballabio
p
a
rse-o
p
tions
.
c
: fix
documentatio
n
syntax of
optional
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n Beye
r
api-built
i
n
.
txt: update
a
nd fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
git-rebase
.
s
h
:
A
d
d
check if rebase
is in progress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
S
te
p
han
Beyer
t34
0
4: stricter tests f
o
r git
-
rebas
e
--inte
r
active
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stepha
n
Be
y
er
api-builtin
.
txt: update and fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merg
e
branch 'r
s
/a
r
ch
i
ve-ignore'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merge
b
ra
n
ch 'lt/racy-emp
t
y'
commit
|
commitdiff
|
tree
2008-06-22
Jun
i
o
C Hamano
Merge branch 's
n
/s
t
at
i
c'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C Hamano
M
e
rge bran
c
h 'jc/maint-combine-diff-
p
re-co
n
text'
commit
|
commitdiff
|
tree
2008-06-22
Jun
i
o C H
a
mano
Merge branch 'lt/maint-gitdir-relative'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge
b
ranch '
j
k/test'
commit
|
commitdiff
|
tree
2008-06-22
J
unio C Hamano
Merge branch 'pb/fa
s
t-expor
t
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Me
r
ge branch 'mo/sta
t
us
-
un
t
racked'
commit
|
commitdiff
|
tree
2008-06-22
J
u
n
io C Hamano
Me
r
ge
b
ran
c
h
'
kh/update-ref'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
a
m
an
o
M
erge
b
ra
n
ch 'jn/web'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio
C
H
a
ma
n
o
M
er
g
e
b
ranch '
r
g/gitweb'
commit
|
commitdiff
|
tree
2008-06-21
Shawn O
.
Pearce
C
o
rrect
documentatio
n
for git-push
--mi
r
ror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next