repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t5801: fix an earlier mismerge
2013-05-07
Ju
n
io C
Ha
m
ano
t5801: fix an earlie
r
m
ismerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-07
Junio C
H
amano
Merge
b
r
anch 'maste
r
' into next
commit
|
commitdiff
|
tree
2013-05-07
Juni
o
C
Hamano
Merge branch 'jk/me
r
ge-tree-added-identically'
commit
|
commitdiff
|
tree
2013-05-07
John
K
e
eping
merge-tree:
h
an
d
l
e
di
r
e
ctory/em
p
ty
c
o
n
f
lict correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-07
Jun
i
o C Hama
n
o
M
erge bran
c
h '
f
c/remote-bzr'
commit
|
commitdiff
|
tree
2013-05-07
Felipe Contrera
s
remote-bz
r
:
avoid bad re
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-06
Felipe Contreras
remote-bzr:
c
o
nvert
a
ll unicode key
s
to str
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-05
Juni
o
C
H
amano
Merge branch
'
fc
/
p
u
s
h-with-export-reporting-resu
l
t'
commit
|
commitdiff
|
tree
2013-05-05
Felipe
C
o
n
t
re
r
as
transpor
t
-
helper
:
improve push messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
M
e
rge branch '
m
h/fetch-into-sh
a
l
lo
w
' i
n
to nex
t
commit
|
commitdiff
|
tree
2013-05-03
Jun
i
o C Hamano
Sync
w
it
h
v1
.
8
.
3-rc1
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
Git 1
.
8
.
3
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
Junio C
Hama
n
o
Merge bran
c
h 'tr/un
p
ack
-
entry-use-after-free-fi
x
'
commit
|
commitdiff
|
tree
2013-05-03
J
u
nio
C
Hama
n
o
Syn
c
wit
h
maint
commit
|
commitdiff
|
tree
2013-05-03
Junio C Ha
m
ano
Mer
g
e bran
c
h '
t
r/remote-ti
g
h
ten-commandline-parsing
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
Junio
C
Hamano
M
e
rge branc
h
'jn/glossa
r
y-revisi
o
n
' int
o
main
t
commit
|
commitdiff
|
tree
2013-05-03
F
elipe
Contrera
s
completion: zsh: don't overri
d
e suffix on _d
e
t
ault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-02
A
nders Granskogen
.
.
.
Documentati
o
n/gi
t
-commit: T
y
p
o under --edit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-02
Michae
l
H
eemskerk
t5500
:
add te
s
t
for fetch
i
ng with an un
k
nown 'sha
l
low'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merge bra
n
ch 'master' int
o
nex
t
commit
|
commitdiff
|
tree
2013-05-01
Juni
o
C
H
aman
o
Merge branch
'
jk/test-outp
u
t
' into ne
x
t
commit
|
commitdiff
|
tree
2013-05-01
Junio C Haman
o
Merge
b
ranch 'rj/sparse' in
t
o next
commit
|
commitdiff
|
tree
2013-05-01
Ju
n
i
o
C Ha
m
ano
Merge branch 'mh/pack
e
d-
r
e
fs-var
i
ous' into next
commit
|
commitdiff
|
tree
2013-05-01
Mich
a
el Haggerty
r
e
fs: handle t
h
e main ref_cache specially
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Hag
g
e
r
t
y
r
e
fs
:
chang
e
d
o_for
_
e
ach_*() functions to take ref_cache
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Mi
c
h
a
el Hagger
t
y
pa
c
k_one_ref(): do some ch
e
ap tests before
a more
e
x
pensiv
e
one
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
pack_one
_
re
f
(): use write
_
packed_entry() to do th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Ha
g
ger
t
y
pack_one_ref(): use functi
o
n pe
e
l_entry()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Micha
e
l Ha
g
gerty
refs: inline funct
i
on do_not_prune
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael
Hagger
t
y
pa
c
k_r
e
fs(): cha
n
ge
t
o use do_f
o
r_each_entry()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Hagger
t
y
r
e
fs: us
e
same
lock_file objec
t
for bot
h
ref-pa
c
king
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Micha
e
l Hagg
e
rty
pack_
o
ne_ref
(
): rename "path" par
a
meter t
o
"re
f
na
m
e
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
ichael Haggerty
pack-refs: merge code from pack-refs
.
{c,
h
}
into refs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michae
l
Haggerty
pa
c
k-r
e
fs: rename
handle
_
o
n
e_ref() to pack
_
one_ref()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
i
c
h
ae
l
Ha
g
g
e
rty
r
e
fs: extract a functi
o
n
wr
i
t
e_packed_ent
r
y()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggert
y
repack_w
i
thout_ref(
)
: write peeled refs in the re
w
ritten
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
ich
a
el
H
aggerty
t
3
211: d
e
monstra
t
e
loss of peeled refs if a
packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
ichael Haggerty
refs: ch
a
ng
e
how p
a
cked refs are del
e
ted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
i
chael
H
aggerty
sea
r
ch_ref
_
dir():
r
et
u
r
n
an inde
x
rat
h
er than a pointer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
repack_without_ref(): s
i
lence errors for dangling
pac
k
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
ichael Haggerty
t321
0
: t
e
st for
s
p
u
rious er
r
or mes
s
ages for
dangling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michae
l
H
agger
t
y
refs:
c
h
a
nge the int
e
rnal re
f
erence-iteration AP
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Mich
a
el Haggerty
refs: ext
r
act a function p
e
el_e
n
t
ry()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
peel_ref(): fix return value for non-peelable, no
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
i
c
hael Hag
g
erty
peel_object(): give m
o
re specif
i
c inform
a
tion in return
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
ichael Hag
g
erty
r
efs: extract function pee
l
_objec
t
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Hagg
e
r
ty
r
e
fs: extract a functi
o
n ref_resolves_to_objec
t
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael
Haggerty
r
epa
c
k_without
_
ref(): u
s
e fun
c
tion get_packed_ref()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Micha
e
l H
a
gge
r
t
y
p
e
el_ref()
:
use
f
unction g
e
t
_
packed_ref()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
get_packed_ref(): return a re
f
_ent
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
do_for_each_r
e
f
_in_dirs(): remove dea
d
code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Hagge
r
ty
refs: define
c
o
n
stant PEELED_
L
INE_LENGTH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michae
l
Haggerty
refs: docu
m
ent ho
w
current_
r
ef i
s
used
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael
H
agge
r
ty
refs: doc
u
ment do_for_each_r
e
f(
)
a
nd do_one_ref()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
M
i
chael Hagge
r
t
y
refs: document the fiel
d
s of st
r
uct ref_value
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
refs
:
d
ocument flags con
s
tants REF_*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
J
u
nio C Hamano
Update
d
raft
relea
s
e
notes to 1
.
8
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Marc
Br
a
nchaud
Fix
g
r
ammar in th
e
1
.
8
.
3 release notes
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
M
erge br
a
nch 'hb/git-pm-te
m
pfile'
commit
|
commitdiff
|
tree
2013-05-01
J
un
i
o
C
Hamano
Merge branch 'rs/pp-user-info-without
-
extr
a
-all
o
cation'
commit
|
commitdiff
|
tree
2013-05-01
Junio C
H
amano
Me
r
ge br
a
n
c
h
'
tr/remote
-
t
i
gh
t
en-
c
omm
a
n
d
line-parsing'
commit
|
commitdiff
|
tree
2013-05-01
J
unio C Ham
a
n
o
Merg
e
branch 'zk/prom
p
t
-reba
s
e
-st
e
p'
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Contreras
remote-bzr:
acc
e
ss branche
s
o
n
l
y
when
n
eed
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
i
p
e
Contreras
remote
-
bzr: delay p
e
er branch usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
ipe
C
ontreras
r
emote-bzr: iterate revisions prop
e
rly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
e
lipe Contr
e
ra
s
r
e
mote-bzr: imp
r
ove progres
s
r
e
porting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
r
emote-bzr
:
add
option t
o
specif
y
branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
C
ontreras
re
m
ote-bz
r
: a
d
d
custom
m
e
thod
t
o
f
i
n
d branch
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Contr
e
ras
rem
o
te
-
bzr: improve
author sanitazio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
r
e
mote-bzr: ad
d
su
p
port for sh
a
re
d
repo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
C
ont
r
eras
remo
t
e-b
z
r:
fix branch nam
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contr
e
ra
s
re
m
ote
-
bzr
:
add support for bzr repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e Contreras
rem
o
t
e
-bzr: use br
a
nch variable when ap
p
r
opriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contr
e
ras
remote-bzr: fix partially pushed mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contreras
remote-bzr:
fixe
s
for
b
r
anch dive
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe C
o
n
t
reras
remo
t
e-bzr: a
d
d suppor
t
to pus
h
merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
e
l
i
pe Con
t
reras
remote-bzr
:
always t
r
y to update the worktr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
i
p
e C
o
ntrer
a
s
remote-b
z
r: fix order of l
o
ck
i
ng in CustomT
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e Contreras
remote
-
bzr: delay b
l
ob fetching u
n
til the ve
r
y end
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Con
t
reras
remote-bzr: c
l
eanup C
u
sto
m
T
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-30
Th
o
mas Ra
s
t
unpack_en
t
ry: avoid f
r
eei
n
g
ob
j
ects in base
cach
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-30
Junio C Hamano
Merge b
r
anch 'as
/
check-ignore' into next
commit
|
commitdiff
|
tree
2013-04-29
Adam Spier
s
t000
8
:
use name
d
p
ipe
(
FIFO) to t
e
st c
h
eck-ignore stream
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Joh
n
Keeping
test output:
respe
c
t $TEST_OUTPUT_DIRE
C
TORY
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Junio C Ham
a
no
Merg
e
bra
n
c
h 'ma
s
ter' into ne
x
t
commit
|
commitdiff
|
tree
2013-04-29
Junio
C Hamano
Merge branch 'mh/fetch-int
o
-
s
h
allo
w
' into next
commit
|
commitdiff
|
tree
2013-04-29
Junio
C
Ha
m
ano
Merge
branch 'rs/pp-
u
ser-info-without-extra-all
o
ca
t
ion
.
.
.
commit
|
commitdiff
|
tree
2013-04-29
Junio C Hamano
Merge branc
h
'js/transport-helper-er
r
or-reporting-fix
.
.
.
commit
|
commitdiff
|
tree
2013-04-29
J
u
nio C Hamano
M
erg
e
branch '
t
r/rem
o
te-
t
ig
h
ten-commandline-par
s
ing
.
.
.
commit
|
commitdiff
|
tree
2013-04-29
Junio C Hamano
Merge
b
r
anch 'hb/gi
t
-
p
m-tempf
i
le'
in
t
o ne
x
t
commit
|
commitdiff
|
tree
2013-04-29
Ra
m
k
umar
Ramachand
r
a
git-
c
ompletion
.
bash: add remote
.
pushdefault
t
o
conf
i
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Rama
c
h
andra
gi
t
-completi
o
n
.
bash: add b
r
a
nch
.
*
.
pushremote
t
o conf
i
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
J
u
nio C Ha
m
ano
Mer
g
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2013-04-29
J
unio C Hamano
Mer
g
e branch '
f
c
/
z
s
h-comp
l
etio
n
'
i
nt
o
main
t
commit
|
commitdiff
|
tree
2013-04-29
Felipe C
o
ntrera
s
co
m
plete: zsh: use zsh completion for
t
he main c
m
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Felipe Co
n
treras
complet
e
: zs
h
: trivi
a
l
simplification
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ra
m
kumar Ram
a
chandr
a
git-co
m
pletio
n
.
bash: comple
t
e branch
.
*
.
rebase as boolean
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ram
k
umar Ramachandra
git-c
o
mpletion
.
bash: add
d
iff
.
submodule to config lis
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachandra
git-
c
o
mplet
i
on
.
bash: l
e
xical sorting for diff
.
stat
G
rap
h
Width
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
H
.
Merij
n
Brand
Git
.
pm: call te
m
pfile from F
i
le::Temp as
a regu
l
ar
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next