repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Build in merge
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
V
ajna
Fix t7601-merge-pul
l
-
config
.
s
h
on A
I
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-
t
r
ee: mak
e
it
usable from other builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Add new t
e
st case to ensure git-merg
e
pre
p
ends the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new test case to
ensure
git-merg
e
re
d
uc
e
s o
c
topus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio C Hamano
Introduce reduce_heads()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
J
unio C Hamano
I
ntroduce
g
et_me
r
ge_bases_many()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
lo
s
V
a
j
na
Add new te
s
t to ensur
e
git-merg
e
handles m
o
re th
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Int
r
oduce get_octopus_m
e
rge_bases() i
n
c
o
mmit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
jna
git-fmt-merge-msg:
m
ake it u
s
able from othe
r
built
i
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Move read_cache_unmerged()
t
o read
-
c
a
che
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add n
e
w test to ensure gi
t
-merg
e
h
a
ndles pull
.
twoh
e
ad
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s Vajna
Move p
a
r
s
e-
o
ptions's sk
i
p
_
prefix()
t
o git-
c
ompat-util
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Mo
v
e
c
ommit_
l
ist_c
o
unt() to commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
o
s
Va
j
n
a
Mo
v
e
s
pli
t
_
c
mdl
i
ne() to alia
s
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-30
B
rian
G
ern
h
ardt
Add tes
t
result
s
dir
e
ctor
y
to t/
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff Ki
n
g
do
c
/rev
-
p
a
rse: clarify reflog v
s
--until
f
or specifyin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio
C
Hamano
Update draft rel
e
ase note
s
for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jrnieder@uch
i
cago
.
edu
Documentation: don
'
t
a
ssume git-sh-setu
p
a
n
d g
i
t-pa
r
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Juni
o
C
Ha
m
a
no
t9
7
00: sk
i
p wh
e
n Test::More is n
o
t available
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Junio C
Hamano
Merge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-06-29
Eric Wong
g
i
t
-
svn:
do
n
't
s
anitiz
e
rem
o
te names in
c
on
f
ig
Junio C Hamano
wrote in <7vfxr23s6m.fsf@gitster...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Marin
show
_
stats(
)
: fix s
t
a
ts width calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Ol
i
vi
e
r M
a
r
i
n
Doc
u
ment
a
tion: r
e
move
{s
h
ow,whatchan
g
ed}
.
difftr
e
e config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery Pe
n
narun
g
i
t-svn: avoid fill
i
n
g up
t
he disk with temp file
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
B
jö
r
n Steinbrink
git cat-file: Fix me
m
o
r
y leak in bat
c
h
mod
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joey H
e
ss
fix git
c
onfig e
x
a
m
ple syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joche
n
Voss
avoid
o
f
f
-by-one
e
rror in run_uplo
a
d_archive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wiemann
GIT-VERSION-G
E
N: do
not fail if a
'
HEAD' file exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Johannes
Schindelin
commit-t
r
e
e
: lift c
o
mpletely arbitrary limit of
16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Dmitry Potapov
shrink g
i
t-shel
l
b
y avoi
d
i
n
g redundan
t
dependencies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Christian Couder
he
l
p: check early if we have a command, if not try
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
u
ni
o
C Haman
o
Document the
double-dash
"rev -
-
path" disamb
i
guator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Ted Pe
r
c
i
va
l
D
on't use dash commands
(git-foo) in
t
ut
o
rial-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Lea W
i
emann
test-
l
ib
.
sh: show git init
output when in verbo
s
e mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
unio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-06-27
J
u
n
io C Hama
n
o
Merge branch 'maint
-
1
.
5
.
5' in
t
o maint
commit
|
commitdiff
|
tree
2008-06-27
Junio C Haman
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
b
ranch 'main
t
-
1
.
5
.
4' i
n
t
o m
a
i
nt-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C
Hamano
GIT 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
git-shell: ac
c
ept
"
g
i
t foo" fo
r
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o C Ha
m
ano
d
i
ff --check: do
not d
i
sc
a
rd
erro
r
status upon seeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jeff K
i
ng
improve for-each-r
e
f t
e
s
t
script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
i
ng Xue
A
d
d
'git-p4
.
allowSubmit' to git-p4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Ham
a
no
Start
d
raft
r
elease
n
o
te
s
for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dmitr
y
Potapov
update-ho
o
k-
e
x
a
mple: option
a
lly allow
n
on-fast-forwa
r
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C
H
amano
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2008-06-26
Alex
R
ies
e
n
F
i
x
use of "perl -i"
on W
i
ndows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C
Hama
n
o
G
I
T
1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o C Hamano
Merg
e
bran
c
h '
s
b
/
rebase'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merg
e
branch 'lw/g
i
t
web'
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
io C Hamano
Merge
bra
n
ch 'lt/co
n
f
ig-fsync'
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
i
o C
H
amano
Merge branch 'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hamano
Merge
b
ranch 'jh/clo
n
e-packed
-
refs'
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
io C Hamano
Me
r
g
e br
a
nch
'lw/p
e
rlish'
commit
|
commitdiff
|
tree
2008-06-25
D
m
itr
y
Pot
a
pov
f
i
x update-
h
ook-exam
p
le to
work with packed
ta
g
references
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff
K
ing
clone: cr
e
ate interme
d
iat
e
di
r
e
c
tories of
destinati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ha
m
ano
Merge branch 'jc/maint-combine-diff-pr
e
-conte
x
t'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C Hama
n
o
Merge bra
n
ch
'lt/maint-gitdir
-
relat
i
ve' into maint
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge bran
c
h 'sb/mai
n
t-rebas
e
'
into maint
commit
|
commitdiff
|
tree
2008-06-25
Jeff
King
for-ea
c
h-ref: implement
m
iss
i
ng tag v
a
lu
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ni
c
olas Pitre
v
er
i
fy-pack
:
test for de
t
e
ction of index v2 object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
v
erify-pack: check pac
k
ed o
b
je
c
t CRC when
using index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nico
l
as Pitre
move
s
how
_
p
ack_i
n
f
o
() whe
r
e
it belongs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nico
l
as Pitre
optimize
v
e
rify-pack a
b
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
clone: crea
t
e inte
r
m
e
diate directorie
s
of destin
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C
Ham
a
no
Ship sa
m
p
l
e hooks with
.
sample suffix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C H
a
mano
pre-rebase hook up
d
ate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pi
t
r
e
r
efac
t
or pack struct
u
re allocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas
P
itre
test
c
ase for
pack resili
e
n
c
e a
g
a
inst c
o
rr
u
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas
P
itre
i
m
plement so
m
e resilience
a
gains
t
pac
k
c
o
rruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nic
o
las Pitre
cal
l
i
nit_pack_revind
e
x(
)
lazily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Jun
i
o
C Hamano
M
erge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-06-24
Jan Krüger
git-svn
:
mak
e
rebui
l
d
r
e
s
pect rewri
t
eRo
o
t o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Patrick Higgins
Workaround for AIX m
k
stemp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Michele Balla
b
i
o
t9
3
01-fast-export
.
sh: R
e
move debug
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Linus Torval
d
s
S
h
rink the
g
it binary a bit by avo
i
ding
unnecessary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Junio
C
H
a
mano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
Extend pars
e
-
o
ptions test suite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stepha
n
Beyer
api-parse-options
.
tx
t
:
I
ntroduce d
o
c
u
mentat
i
on for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Michele Ballabio
p
ar
s
e-option
s
.
c: fix docume
n
tation syntax of optional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n Be
y
er
api-b
u
iltin
.
txt:
updat
e
and fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
git-rebase
.
sh
:
A
dd
c
h
eck if rebase is in progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
t3404: st
r
icter tests f
o
r git-re
b
ase--interactiv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beye
r
a
pi-builtin
.
txt:
u
pdate and fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C
H
amano
Me
r
g
e
branch 'r
s
/a
r
chive-igno
r
e'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
erge branc
h
'lt/racy-empty'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
amano
Merge bran
c
h
'
sn/s
t
atic'
commit
|
commitdiff
|
tree
2008-06-22
Junio C H
a
mano
M
e
rge
b
ranch 'jc/maint-combin
e
-diff-
p
r
e
-context'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merge branch 'lt
/
maint-gitdir-
r
elative'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C
H
amano
Merge b
r
an
c
h 'jk/
t
est'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge b
r
anch 'pb/fast-export
'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
Hamano
Merge branch
'
mo/status-untracked'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Mer
g
e branch
'
kh/u
p
d
a
t
e
-ref'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merge branch '
j
n
/
web'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C Ham
a
no
Merge branch 'rg/gitweb'
commit
|
commitdiff
|
tree
2008-06-21
Shawn O
.
Pearce
Co
r
rect
d
ocumentat
i
on for gi
t
-
p
u
sh --mirror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
Jakub
Narebski
t/REA
D
M
E
:
A
dd 'Skipping Tests
'
section
below
'Running
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
Cris
t
ian Pe
r
aferrer
P
r
i
nt errno upon
failure to op
e
n the COMM
I
T_ED
I
TMSG
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next