repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/prune-packed-dryrun-verbose'
2013-05-17
Junio C Hamano
M
e
rge git://ozlabs
.
o
rg/~paulu
s
/gitk
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Keepi
n
g
difftoo
l
:
f
ix
dir
-
diff when
f
ile do
e
s not
exist in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Felipe Contreras
remote-bzr: fix
e
s
for
o
lder versions of bzr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Sand
o
r Bodo-Merle
remote-bz
r
: fix old organiz
a
tion destroy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
R
a
mkumar Rama
c
handra
pro
m
pt: c
o
l
orize
ZSH prompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Ramkumar
Ram
a
ch
a
ndra
prompt: factor out gitstrin
g
col
o
ri
n
g logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
R
a
mkumar Rama
c
ha
n
dr
a
pro
m
p
t
: intr
o
du
c
e GIT_PS1_STATESEPARATO
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Richard Hansen
Documentation
/
merge-op
t
ions
.
tx
t
: resto
r
e
`
-e` optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Fe
l
i
pe Contr
e
ras
Re
v
ert "remote-
h
g:
updat
e
bookmar
k
s when
p
u
l
l
ing"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
J
u
ni
o
C Hamano
str
b
uf_br
a
nchname():
d
o
n
o
t
d
ouble
-
expand @{-1}~2
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Da
l
e
R
.
Worley
git-submodule
.
t
xt
:
Clarif
y
'in
i
t
'
and
'add' subcommands
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
r
acey
revision
.
c: treat A
.
.
.
B mer
g
e bases as if
m
a
n
uall
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Felipe Contrer
a
s
remo
t
e-bzr: fix cloni
n
g of no
n
-listable
repos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Juni
o
C Hama
n
o
Me
r
ge branc
h
'fc/rem
o
te-
h
g'
(
ear
l
y
p
art)
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contre
r
as
re
m
ote-hg: update book
m
arks when pulli
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe
Co
n
treras
remote-
h
g
:
don't push fake 'master' bookm
a
rk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
F
e
lipe
C
o
n
t
r
er
a
s
r
emote-
h
g: d
i
sa
b
l
e forced push by default
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe
Cont
r
eras
remote-
h
g: fix new b
r
a
n
c
h creation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe
Contreras
re
m
ote
-
h
g
: add new ge
t
_config_bool
(
) he
l
per
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
rem
o
te
-
hg: enable track-
b
ranches in hg-git mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
F
e
li
p
e
Con
t
reras
remote-hg: get rid of unused exc
e
ption
checks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felip
e
Contrera
s
remote-hg: trivial c
l
ean
u
p
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Matthijs
K
ooij
m
an
co
m
bine-dif
f
.
c: Fix output when ch
a
nges ar
e
exact
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-14
Felipe Contre
r
as
remote-bzr: update old organi
z
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Thomas Rast
covera
g
e: bui
l
d
c
o
verage-unte
s
ted-func
t
ions
by defa
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Thomas
R
ast
c
ov
e
rage: se
t
DE
F
AULT_TEST_
T
ARGET to avoid using prove
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Thomas Rast
co
v
erage:
do
n
ot del
e
te
.
gcno files before b
u
i
l
d
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Thomas Ra
s
t
coverage:
split
bui
l
d
target int
o
c
o
mpi
l
e an
d
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Junio C Hamano
Git 1
.
8
.
3
-
rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t6019: demonstrat
e
--an
c
e
s
t
ry-path A
.
.
.
B breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Junio C Hamano
Merge git://ozlabs
.
org/~paul
u
s/g
i
tk
commit
|
commitdiff
|
tree
2013-05-12
Junio C
Ham
a
no
t5551: do n
o
t use unportable sed '\+'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-12
Jeff King
fetch: opportunistically upd
a
te tracking ref
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-12
Jeff
King
re
f
a
cto
r
"ref->merge"
f
lag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-12
T
homa
s
Rast
fetch/pull doc: unt
a
ngle me
a
ning
o
f bare <re
f
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-12
Jeff Kin
g
t
5
5
1
0
:
s
ta
r
t tracking-ref
t
e
sts from a kno
w
n state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-11
T
ors
t
en Bögershausen
test-bzr: do not use
unportable sed
'
\
+'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-11
Junio C Ham
a
no
Merge git
:
//g
i
t
.
bogomips
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefile: fix defau
l
t regex setting
s
o
n
Darwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-10
F
e
lipe
Contre
r
a
s
transport-helpe
r
: fix remote
helpe
r
na
m
espac
e
regres
s
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-10
Dale
W
orl
e
y
C
o
ding
G
uidelines: Documentation/*
.
txt
are the sources
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-10
Felip
e
Co
n
treras
t
est:
remote-helper: add missing and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio
C
Hamano
Sync with v1
.
8
.
2
.
3
commit
|
commitdiff
|
tree
2013-05-09
J
unio C H
a
mano
Git 1
.
8
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio C Ham
a
n
o
Merge
b
ran
c
h 'mv
/
sequ
e
n
c
er
-
pic
k
-error-
d
ia
g
'
commit
|
commitdiff
|
tree
2013-05-09
Junio C Hamano
cherry-pick:
p
ickin
g
a t
a
g that r
e
solves to a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Ju
n
io C Ha
m
ano
Merge branch
'
tr/copy-revisions-from-stdin
'
into maint
commit
|
commitdiff
|
tree
2013-05-09
René Sc
h
arfe
t5004: avo
i
d usi
n
g
t
a
r for c
h
e
c
k
i
n
g empt
i
ness of a
r
chive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
René Sch
a
rfe
t
5
004:
r
esu
r
rect or
i
ginal empty tar a
r
chive test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
René Sc
h
arfe
t5004
:
a
v
o
id using
t
a
r
for checking emp
t
i
ness of
a
r
chiv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
R
ené Scharf
e
t
5
004
:
ignore pax glo
b
a
l
h
ea
d
er file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
m
erg
e
tools/k
d
iff3:
do not use --auto when d
i
ffing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Feli
p
e Contreras
transport-he
l
per
:
triv
i
al
s
tyle cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Vikrant Varma
m
e
rge: use
help_
u
nknown_ref()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
V
ikra
n
t Varma
help: add h
e
lp_un
k
nown_ref()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Contreras
completion: synchronize zsh wrapper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Co
n
t
r
e
ras
completion: cle
a
nup zsh wrapper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Juni
o
C Hamano
Update draft release notes f
o
r 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Fel
i
pe Contr
e
ras
remote-helper
s
: trivial cleanu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Con
t
reras
remote-bzr: fix f
o
r disappeared revis
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Junio C Hama
n
o
Merge git:/
/
github
.
c
om
/
git-l10n/git-p
o
commit
|
commitdiff
|
tree
2013-05-07
F
e
li
p
e Contreras
fast
-
{
imp
o
rt,expo
r
t}: use g
e
t_s
h
a
1
_
h
ex() to r
e
ad f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Nguyễn Thái Ngọc Duy
clon
e
: allow cl
o
ning local paths with colons in them
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Felip
e
Contreras
fast-export: don't parse
c
omm
i
ts while read
i
ng marks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Felipe Cont
r
eras
fast-export: do
n
ot parse
non-commit objects while
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Ju
n
io C Hamano
deprecate core
.
s
tatinfo at Git 2
.
0 bo
u
nda
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Junio C
H
amano
Merge br
a
nch 'jk/me
r
g
e-t
r
ee-added-identically'
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
m
erge
-
tree: handle directory/empty conflict
cor
r
ectl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
Junio
C Hamano
Merge
branch 'fc/r
e
mote-bzr
'
commit
|
commitdiff
|
tree
2013-05-07
F
el
i
p
e Co
n
treras
remote-bzr: a
v
oid bad refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-06
Fe
l
i
pe
C
ontrera
s
remote
-
bzr
:
c
onvert all uni
c
o
d
e keys to st
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-06
Jo
h
n Keeping
t/Makefil
e
:
don't define TES
T
_RESULTS
_
DIRECTORY rec
u
rsively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-05
Junio C Ham
a
no
Merge branch 'f
c
/push-with-export-
r
eporting-result'
commit
|
commitdiff
|
tree
2013-05-05
Felipe Cont
r
eras
tr
a
nsport-helper: impr
o
ve pus
h
m
essages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
Junio C
Hama
n
o
Git 1
.
8
.
3-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
M
erge branch 'tr/unpack-entry-use-after-f
r
ee-fi
x
'
commit
|
commitdiff
|
tree
2013-05-03
Junio C Ha
m
a
no
Sync wit
h
maint
commit
|
commitdiff
|
tree
2013-05-03
J
u
nio C
H
ama
n
o
Merge branch 'tr
/
r
e
mote-ti
g
hten-commandline-parsin
g
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
J
un
i
o C Hamano
M
erge branc
h
'jn/gloss
a
r
y-revision' into maint
commit
|
commitdiff
|
tree
2013-05-03
Felipe Con
t
rer
a
s
co
m
pletion:
z
s
h: don't override s
u
ffix
o
n _detault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-02
Ande
r
s Granskogen
.
.
.
D
o
cumen
t
ation/git
-
comm
i
t: Ty
p
o under --edit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-02
Mi
c
hael Heemsker
k
t5500: add test for fetchin
g
with a
n
u
n
k
nown 'shallow'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-02
Jeff Ki
n
g
lookup_object: prioritize recently fo
u
nd o
b
j
ects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
refs: han
d
l
e the m
a
i
n
ref_cache specially
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
refs:
change
d
o
_for_each_*
(
) f
u
nctions to
take ref_cac
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michae
l
Haggerty
p
a
ck_one
_
ref(): do
some cheap tests
b
ef
o
re a more
exp
e
ns
i
v
e one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Hag
g
e
rty
pac
k
_one_
r
ef(): use
w
rite_packed_entry() to
do the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
M
ichael Haggerty
pack_one_re
f
()
:
use function peel_entry()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
r
efs: inline functio
n
do_no
t
_prune()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
M
i
ch
a
el Hagge
r
t
y
pack_refs(): change to use do_
f
or_eac
h
_entry
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
refs:
u
se sa
m
e
l
o
c
k_file object for both ref
-
packing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
pac
k
_o
n
e
_
ref(): r
e
name
"
path" parameter to "refname
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Mich
a
el Ha
g
gert
y
pack-refs:
m
erg
e
c
o
de from p
a
ck-refs
.
{c,h} into refs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
pack-refs
:
ren
a
m
e
handle_one_ref
(
)
to pack
_
one_ref()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
refs: extrac
t
a function
w
rite_packed_entry()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Hagger
t
y
re
p
ack_
w
ithout_ref(): w
r
ite peeled ref
s
in the re
w
ritten
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
t3
2
11:
d
emonstrate loss of
p
eeled refs if a packed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Michael Haggerty
refs: cha
n
ge
how packed refs are deleted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Micha
e
l Hagg
e
rty
search_ref
_
dir():
return an index rather
t
h
an
a
pointer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
M
i
c
hael Haggerty
re
p
ack_
w
ithout_ref()
:
sile
n
ce erro
r
s
for da
n
g
l
in
g
packe
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next