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
Add a new test for git-merge-resolve
2008-07-13
Mikl
o
s Vajna
Ad
d
a new tes
t
for git-merge-resolve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os V
a
jna
t6021: add a n
e
w test
f
or git-merge-resolve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Jun
i
o C H
a
mano
Teach
merge
.
log to "git
-
m
erge" again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
Fix
t
7
6
0
1-merge-pull
-
config
.
s
h
on
AIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
V
ajna
git-
c
ommit-tree: make it usable fro
m
oth
e
r builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
A
dd n
e
w
t
est cas
e
to ensure git-merge prepends t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Add new
t
est
case to
e
nsu
r
e gi
t
-merge reduces octopus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio
C
Hamano
I
n
troduce redu
c
e_hea
d
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Jun
i
o C Hamano
Introduce get_m
e
rge_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-merg
e
hand
l
es more t
h
an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Introduce ge
t
_octopus_merge_b
a
ses() in commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
git-
f
m
t
-
me
r
g
e-msg
:
make it
u
sab
l
e from other builtins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vaj
n
a
Move read_cac
h
e_unme
r
ged() to r
e
a
d-ca
c
he
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new
test
t
o
ensure g
i
t
-m
e
rge han
d
les pu
l
l
.
twohead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vaj
n
a
Move par
s
e-op
t
ions's skip_prefix() to git-compat-util
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Mo
v
e
c
ommit_list_count() to
c
ommit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Mov
e
s
plit
_
cmdl
i
ne() to alias
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
u
nio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-06-30
B
r
ian Ge
r
n
h
a
r
dt
Add test re
s
ults direc
t
ory to t/
.
gitign
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff
K
ing
doc/r
e
v-parse:
clari
f
y
refl
o
g vs -
-
unti
l
for specifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
u
nio C Ham
a
n
o
Up
d
ate draft releas
e
notes
f
or 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jr
n
ieder
@
uchicago
.
e
du
Docu
m
en
t
ati
o
n
:
don't assume git-sh-setup and git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C
H
am
a
no
t970
0
: skip when Test::More is
not avai
l
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
J
unio C Hamano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-06-29
Eric Wong
git-sv
n
:
don't s
a
n
i
t
ize remote names 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
Olivier Marin
show_stats(): f
i
x stats w
i
dt
h
calcu
l
a
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier Mar
i
n
D
ocumentation: remove {show,w
h
atchanged}
.
difftr
e
e
c
o
n
fig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery Pennarun
git-svn: av
o
id
filling up th
e
disk wit
h
temp files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Björn Steinb
r
i
n
k
git cat-file: F
i
x memor
y
leak i
n
batch
mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joe
y
H
e
ss
fix git co
n
fi
g
example s
y
ntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Jochen Vo
s
s
avoid off-by-one error in run_upload_archive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wie
m
ann
GIT-VERSI
O
N-GEN:
do
n
ot
fail if
a
'HEA
D
' file ex
i
s
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
J
o
hannes Sc
h
in
d
e
lin
commit-tree: lift completel
y
arbitrary limi
t
of 16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
D
mit
r
y Potapov
shrink git-
s
he
l
l b
y
avoiding r
e
dundant depend
e
ncies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Chri
s
ti
a
n Cou
d
er
help: check early if
w
e h
a
ve a command, if not try
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
unio C
H
a
mano
Docu
m
ent the
d
o
u
bl
e
-dash "rev -- path" disambiguator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Te
d
Perciva
l
Don't use dash
command
s
(git-foo)
i
n
tutor
i
al-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
L
ea Wi
e
mann
test-lib
.
sh:
show g
i
t init outpu
t
when in verbose
mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hama
n
o
Me
r
g
e
branch
'ma
i
nt
'
commit
|
commitdiff
|
tree
2008-06-27
Junio C Ham
a
no
Merge br
a
nch
'
ma
i
nt-1
.
5
.
5' in
t
o maint
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 Hamano
Merge branch 'm
a
int-1
.
5
.
4
'
int
o
maint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
J
u
nio
C Haman
o
G
I
T 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
uni
o
C
H
amano
git-shell:
accept "git
f
oo" form
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Ju
n
io C H
a
mano
diff --check: do
n
ot discard er
r
or
s
tatus upon seeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jeff King
improve for-each-ref
test
s
c
ript
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
i
ng Xue
Add 'git-p
4
.
a
l
lowSubm
i
t' to
g
it-p4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
Sta
r
t draft
r
eleas
e
n
o
t
e
s
f
or 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dmitry Potapo
v
update-
h
ook-
e
xample:
o
ptionally
a
llow non-fast-forward
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio
C Hamano
M
e
r
ge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Alex R
i
esen
Fix
use
o
f "perl -i" on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Juni
o
C Hamano
GIT
1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C
H
amano
Merge
branc
h
'sb/rebase'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ham
a
no
Merge
b
ranch 'lw/gitweb'
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
i
o C Ha
m
ano
Merge bran
c
h 'lt/config-f
s
y
n
c'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hamano
M
erge bra
n
ch 'sr
/
tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hamano
Merge b
r
anch '
j
h/clo
n
e-packed-r
e
f
s
'
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Hama
n
o
Merge branch '
l
w/per
l
i
sh
'
commit
|
commitdiff
|
tree
2008-06-25
Dm
i
try Potapov
fix up
d
ate
-
hook-example to work with p
a
c
ked ta
g
r
eferences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jef
f
King
c
lo
n
e: cr
e
ate int
e
rmediate d
i
rectories o
f
d
e
stina
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C H
a
ma
n
o
Merge
br
a
nch
'
jc/maint-combin
e
-diff-pre-conte
x
t
' into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Mer
g
e
b
ranch 'lt/m
a
int-gi
t
dir-relative' i
n
to maint
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ha
m
ano
M
e
rge br
a
nch
'sb/maint-rebase' into maint
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
for-each-ref: imp
l
eme
n
t miss
i
ng tag values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitr
e
ver
i
fy
-
pack: test for
detection of index v2 obje
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
N
ico
l
as Pitre
verify-
p
ack: chec
k
pack
e
d object CR
C
when usin
g
i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas
Pitre
move show_pac
k
_
i
n
fo()
w
h
ere it belongs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
N
i
c
o
la
s
Pitre
optimize ve
r
ify-pack a
b
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
clone:
c
rea
t
e
i
ntermed
i
ate directories of destin
a
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o
C Hamano
S
h
ip sample hooks with
.
sample
s
uffi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
u
n
io C Hamano
pre-reba
s
e
hook update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
refactor pack st
r
ucture a
l
locat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nic
o
las Pi
t
r
e
test case
f
o
r
pack re
s
ilience
a
g
a
i
nst cor
r
u
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
implement some resilience aga
i
n
st
p
ack co
r
rup
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nic
o
las Pitr
e
call init
_
pa
c
k
_r
e
vindex() lazily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Jun
i
o
C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-24
Jan
K
rü
g
er
git-svn: make rebuild respect
rewriteRoot option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
P
a
trick Higgins
Wor
k
around
f
o
r AIX mk
s
t
emp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
M
ich
e
le B
a
llabi
o
t
930
1
-
f
a
s
t-expo
r
t
.
sh: Remove d
e
bug l
i
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Lin
u
s Torvalds
Shrink the git binary a b
i
t by avoiding unn
e
cessary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Junio C Hamano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-06-23
S
tephan Be
y
er
Extend parse-options test suite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Ste
p
han Beyer
api-parse-options
.
txt: Introduce documen
t
ation f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Michele Balla
b
io
pars
e
-options
.
c: fix docume
n
ta
t
ion
s
yntax
o
f
optional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stepha
n
B
e
ye
r
a
pi-bu
i
lti
n
.
tx
t
: update
and fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n
Be
y
er
git
-
reba
s
e
.
sh:
A
dd check
if rebas
e
is in pr
o
g
r
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
t3404: stricter tes
t
s
f
o
r git-rebase--inter
a
ctive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan B
e
yer
api-builtin
.
txt:
upda
t
e
and fix typ
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Junio
C Hamano
Merge b
r
anch 'rs/archive-ignore'
commit
|
commitdiff
|
tree
2008-06-22
Jun
i
o C Hamano
Merge br
a
nch 'lt/racy-e
m
pty'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
a
m
ano
Merge bran
c
h
'sn/st
a
tic'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
Hamano
Merge
b
r
anch '
j
c/maint-combin
e
-diff
-
pre-context'
commit
|
commitdiff
|
tree
2008-06-22
J
unio C
H
amano
Merge
branch 'lt/maint-gitdir-relativ
e
'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Ham
a
no
Merge branch 'jk/test'
commit
|
commitdiff
|
tree
2008-06-22
J
unio C H
a
man
o
Merge branc
h
'pb/fast-ex
p
ort'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C Hama
n
o
Mer
g
e
b
ran
c
h '
m
o/status-untracked
'
commit
|
commitdiff
|
tree
2008-06-22
J
uni
o
C Hamano
Merge
b
ranch '
k
h/updat
e
-ref
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
a
mano
Me
r
ge
b
ranch 'jn/
w
eb
'
commit
|
commitdiff
|
tree
2008-06-22
J
u
n
i
o C Hamano
Merge branch
'
r
g
/gitweb'
commit
|
commitdiff
|
tree
next