repo.or.cz
/
git.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
Hamano
Teach m
e
rge
.
log to "
g
it-mer
g
e"
again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
u
ild i
n
mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajn
a
F
ix t7601-merge-pu
l
l-config
.
sh
on AIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
git-
c
ommit-tree:
m
a
ke it usable from oth
e
r
b
u
i
ltins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
Add
n
ew tes
t
case t
o
e
n
su
r
e git-merge prepends the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case to ensure g
i
t-merge reduces
o
ctopus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
J
unio C Hamano
Introd
u
ce reduce_heads(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Ju
n
io C Hamano
Introdu
c
e get_
m
erge_bases
_
many()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add new
t
est to ensure
git-merge handles more than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
I
ntroduce get_octopus_merge_bas
e
s() in commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-
f
mt-merge-
m
sg: make
i
t
usabl
e
from othe
r
bu
i
ltins
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Mov
e
read_cache_unmerged()
t
o read-cache
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Va
j
n
a
A
d
d
new te
s
t to ensure git-merge ha
n
d
les pull
.
twohead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os
Vajna
M
o
ve pa
r
s
e-opti
o
ns's skip_prefix() to
g
it-comp
a
t-util
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e commit_lis
t
_coun
t
() to
c
o
mmit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e
s
plit_
c
mdline() t
o
alias
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Juni
o
C Hamano
M
erge bra
n
ch
'
main
t
'
commit
|
commitdiff
|
tree
2008-06-30
Bri
a
n
Gernhar
d
t
Add
t
est
r
e
sults d
i
rectory to t
/
.
git
i
gnore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff
K
i
ng
doc/rev-parse
:
clarify reflog
vs --until for s
p
e
c
ify
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Upda
t
e
d
raft release no
t
es for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jrn
i
eder@uchic
a
go
.
edu
Documentation: do
n
't assume git-
s
h-
s
etup
a
nd git
-
parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Ju
n
io C Ha
m
an
o
t9700: skip when Te
s
t::
M
ore
i
s
not available
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-29
Eric
Wong
git-svn: d
o
n't
sanitize remote nam
e
s 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 M
a
r
in
show_
s
tat
s
(): fi
x
stat
s
wid
t
h
calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Oli
v
ier Marin
D
o
cumentation
:
remove {show,whatchanged}
.
difftree config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery Pen
n
arun
git-svn: avoid filling up the d
i
s
k with
t
e
m
p files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Bj
ö
rn Steinbr
i
nk
git cat-f
i
le: Fix memory leak in bat
c
h mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joey H
e
ss
fix git config example syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
J
oc
h
e
n Voss
avoid off-by-one erro
r
in run_u
p
lo
a
d_
a
rchiv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
L
e
a Wiemann
GIT-VE
R
SI
O
N-GEN: do not fail if a 'H
E
AD' file exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
J
o
hannes Schindelin
commi
t
-
t
r
e
e
: lif
t
completely arbitrary limit of 16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Dmitry Potapov
shrin
k
git-
s
hell by avoidi
n
g redundant dependencies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Ch
r
is
t
ian Couder
help: check early if
w
e have a command, if
n
ot try
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
unio C Ha
m
ano
Docu
m
ent th
e
double-dash
"
r
ev
-- path" disambiguato
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Ted
Percival
Don
'
t use dash commands (git-foo) in tutor
i
al-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Lea
W
iemann
test-lib
.
sh: sh
o
w git i
n
it
o
u
t
put
w
hen in verbose mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
u
n
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o
C Hama
n
o
Merg
e
branch
'mai
n
t-1
.
5
.
5' into maint
commit
|
commitdiff
|
tree
2008-06-27
Junio 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
Hamano
Me
r
ge
b
r
anch 'maint-1
.
5
.
4' into maint
-
1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o C Hamano
GIT 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
u
nio C Hamano
git-shell: accep
t
"git foo" form
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hama
n
o
diff --check: do not di
s
c
a
r
d
e
r
ror status
upon seeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jeff
King
improve fo
r
-each-ref tes
t
script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Ji
n
g Xue
Add 'git-p4
.
allowSubmit' to
g
it-p4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
J
unio C Hamano
Star
t
draft rel
e
ase
n
otes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
D
m
i
try Pot
a
pov
upda
t
e-hoo
k
-e
x
ampl
e
: option
a
lly
al
l
o
w
non-fast-forward
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
Merge
branch 'm
a
int
'
commit
|
commitdiff
|
tree
2008-06-26
Alex
R
iesen
F
ix use o
f
"
perl -i"
o
n Windo
w
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio 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 bran
c
h 'sb/rebase'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Haman
o
Merge
b
ranch 'l
w
/gitweb'
commit
|
commitdiff
|
tree
2008-06-25
J
unio C
H
am
a
no
Merge
b
ranch 'lt/c
o
nfig-f
s
y
n
c
'
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C
H
a
m
ano
Merge branch 'sr
/
tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C
H
amano
Merge br
a
nch
'
jh/clone-
p
acked-ref
s
'
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio
C
Hamano
Merge
bra
n
ch 'lw/perlish'
commit
|
commitdiff
|
tree
2008-06-25
Dmitry
P
o
t
apov
fix updat
e
-hook-
e
xample to
w
ork with
pac
k
ed ta
g
references
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
clone: create intermed
i
ate dir
e
cto
r
ies of
d
e
stina
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Hamano
Merge branch 'jc/m
a
int-combine-diff-pre-context
'
into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch '
l
t/mai
n
t-git
d
i
r
-relative
'
into m
a
int
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io C
H
amano
Merge branch 'sb
/
ma
i
nt-reb
a
se' into maint
commit
|
commitdiff
|
tree
2008-06-25
Jeff Kin
g
for-each-re
f
:
implement m
i
s
sing tag values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nic
o
las
P
i
t
re
v
e
rify-pa
c
k: test for
de
t
ectio
n
of index
v2 object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
ve
r
ify-
p
ack: ch
e
c
k packed object
CRC
w
hen using index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicola
s
Pitre
move show_p
a
ck_info() where it
b
elon
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicola
s
Pitr
e
opti
m
ize verify-
p
ack
a
bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff
King
clone: create intermedia
t
e directo
r
ies
o
f destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Ha
m
an
o
Ship s
a
mpl
e
h
ooks w
i
th
.
sample suffix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
pre-rebase hook u
p
date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
r
e
f
actor pack s
t
ruc
t
u
r
e
allo
c
at
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas
P
itre
te
s
t ca
s
e
f
or
pack resilience against corru
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
i
m
plement
s
o
m
e
resilience against pa
c
k corruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
N
icola
s
Pitre
call init_pack_
r
e
vi
n
dex()
lazily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Junio C Hamano
Merge
b
r
a
nch
'
maint
'
commit
|
commitdiff
|
tree
2008-06-24
Jan Krüger
git
-
svn: make r
e
b
uild resp
e
ct rewrit
e
R
o
ot
o
ptio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Patrick Higgins
Workaround for AIX mkstemp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Michele Ballabio
t
9301-fast-export
.
sh: Remov
e
debug line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Linus T
o
rvalds
Shrink the
g
i
t binary a bit by avoiding unneces
s
a
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Junio C Hamano
Merge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
Extend parse-options test sui
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n
B
eyer
api-parse-option
s
.
txt: In
t
roduce
d
ocumentation
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Michele
Ballabio
p
a
rse-o
p
t
i
ons
.
c:
fix documen
t
ation syntax o
f
opt
i
ona
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
S
tephan
B
eyer
api-builtin
.
txt: update and fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n Beyer
git-rebas
e
.
sh: Add check if rebase is in progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Ste
p
ha
n
Beyer
t3404: stri
c
t
e
r
tests for git-rebase--i
n
ter
a
ctiv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
S
t
e
phan Beyer
api-builtin
.
txt: update a
n
d
f
i
x typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio
C Hamano
M
erg
e
b
r
anch 'r
s
/a
r
chiv
e
-ign
o
re'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C
Hamano
Mer
g
e
bra
n
ch 'lt/racy-emp
t
y'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
amano
Merge branc
h
'sn/static'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C
Hamano
Me
r
ge branch 'jc/
m
aint-
c
ombine
-
diff-pre-c
o
ntext'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
e
rg
e
bran
c
h 'lt/ma
i
nt-gitdi
r
-r
e
lative
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'jk/test'
commit
|
commitdiff
|
tree
2008-06-22
Junio C H
a
mano
Merge br
a
nch
'
pb/fast-export'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Haman
o
Merge
branch 'mo/status-un
t
racked
'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C Ha
m
ano
M
e
rge branch 'kh/upd
a
te-ref'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Ha
m
ano
M
e
r
ge branc
h
'jn/w
e
b'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
amano
Mer
g
e branc
h
'rg/
g
itweb'
commit
|
commitdiff
|
tree
2008-06-21
Shawn O
.
Pearce
Corre
c
t d
o
cumentation for
git
-
pu
s
h --mirror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
Jak
u
b
N
a
r
e
bski
t/README:
A
d
d
'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
next