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
Merge branch 'rr/complete-difftool' into next
2013-06-02
Felipe Cont
r
e
r
as
complet
i
on: av
o
id ls-remote in certain sc
e
narios
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Junio C
H
a
mano
Update draf
t
releas
e
notes to 1
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Junio C Haman
o
Merg
e
branch 'tr/line-log'
commit
|
commitdiff
|
tree
2013-06-02
Ju
n
io C Hamano
M
e
r
ge branch
'mc/describe-f
i
rst-pa
r
e
nt'
commit
|
commitdiff
|
tree
2013-06-02
Junio C H
a
mano
Merge branch 'r
s
/tar-test
s
'
commit
|
commitdiff
|
tree
2013-06-02
Junio C
H
a
mano
Merge branch 'jc/strbuf-b
r
anchn
a
me-fix'
commit
|
commitdiff
|
tree
2013-06-02
Jun
i
o C Hamano
Me
r
ge
branch 'jk/fetch-always-
u
pdate
-
tracking'
commit
|
commitdiff
|
tree
2013-06-02
Junio
C
Hamano
Merge
b
ranch
'
t
r/coverage'
commit
|
commitdiff
|
tree
2013-06-02
Junio C Ham
a
no
Merge br
a
nch 'mk/combine-dif
f
-conte
x
t-horizon-fix'
commit
|
commitdiff
|
tree
2013-06-02
J
u
nio
C
H
amano
Merge branch 'kb/ancestry-p
a
th
-
threedo
t
s'
commit
|
commitdiff
|
tree
2013-06-02
Juni
o
C Hamano
Mer
g
e br
a
n
ch 'jc
/
t5551-posix-sed-bre'
commit
|
commitdiff
|
tree
2013-06-02
J
unio C Hamano
Merge bra
n
c
h
'd
a
/dar
w
in'
commit
|
commitdiff
|
tree
2013-06-02
J
unio C Hamano
Merge b
r
a
nch 'fc
/
macos-
x
-
clipped-wri
t
e'
commit
|
commitdiff
|
tree
2013-06-02
J
unio C Hamano
Merge branch 'vv/
h
el
p
-unknown-
r
ef'
commit
|
commitdiff
|
tree
2013-06-02
Junio
C Ha
m
ano
M
e
rge
b
ranch 'nd/clone-local-with-colon'
commit
|
commitdiff
|
tree
2013-06-02
J
unio C Hamano
Merge bra
n
ch
'
fc/fast
-
export-persiste
n
t-marks'
commit
|
commitdiff
|
tree
2013-06-02
Junio
C
Hama
n
o
Merge branch
'
rs/emp
t
y-archive'
commit
|
commitdiff
|
tree
2013-06-02
Junio C
H
amano
Merge branch
'rh/merge-opt
i
o
ns-doc-fix'
commit
|
commitdiff
|
tree
2013-06-02
Juni
o
C Hamano
Merge branch 'an/di
f
f-inde
x
-
d
oc'
commit
|
commitdiff
|
tree
2013-06-02
Junio C Hamano
Me
r
ge branch 'fc/c
o
mpletion'
commit
|
commitdiff
|
tree
2013-06-02
Junio C Ha
m
ano
Merge
b
ranch 'fc/
z
sh-leftov
e
r-
b
its'
commit
|
commitdiff
|
tree
2013-06-02
Ramkumar Ramachandra
contrib: r
e
move continuous
/
and patches
/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
R
e
né Scharfe
unpack-trees: free cac
h
e_
e
ntry
a
rray members for merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
René
S
charfe
diff-lib, read-tr
e
e,
unpac
k
-t
r
ees: mark cache_
e
ntry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Re
n
é
Scharf
e
diff-lib, read-tre
e
, un
p
ack-trees: mark c
a
c
h
e_ent
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
R
e
né Sc
h
a
rfe
u
n
p
a
ck-tre
e
s
: create wo
r
king
copy o
f
merge entry in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
René
S
c
harfe
u
npack-trees: f
a
c
t
or out
d
up_
e
nt
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
René Scharfe
r
ead-cache: mark ca
c
he_ent
r
y pointers const
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
René Scharfe
cache:
mark c
a
che_entry pointers const
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Michael
Hag
g
erty
refs: document the
lifetime
of the args
p
assed to
each_ref
_
fn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Mich
a
el Haggerty
re
g
i
s
t
er_ref(): make a copy of the bad
re
f
eren
c
e S
H
A-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
M
i
chael Haggert
y
exclud
e
_
e
xist
i
ng(
)
: set existing_ref
s
.
strd
u
p
_
string
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Michael Hagger
t
y
string_lis
t
_add_refs_by_glob():
a
d
d a comme
n
t
about
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Michael Hagg
e
r
t
y
s
t
r
in
g
_list_add_one_ref(): r
e
name first parameter to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Michael
H
aggerty
s
h
ow_
h
ead_ref
(
): rename f
i
rst par
a
meter to "r
e
fname"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Michael Haggerty
sh
o
w
_head_ref(): do
n
ot shad
o
w
name of argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Michael Hagger
t
y
add_existing(): d
o
not
r
e
tain a reference
t
o sh
a
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Michael Hagge
r
t
y
do_fetch()
:
clean up e
x
isting_refs before exiting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Michae
l
Haggerty
do_fetch(): re
d
uce scope of peer
_
item
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
M
i
ch
a
el Haggerty
o
b
ject_ar
r
ay_entr
y
:
fix memory
handlin
g
o
f the nam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Karst
e
n Ble
e
s
d
i
r
.
c:
fix
ignore process
i
ng
w
ithin
n
o
t-ignored d
i
r
e
ctories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Anthony Ra
m
ine
w
i
ldm
a
t
ch: properly
fo
l
d case e
v
ery
w
here
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Jeff King
t000
5
: tes
t
git exit
c
ode from
s
ig
n
a
l
death
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Thomas Rast
Test
'commi
t
-
-
only' after
'
checkout --
o
rphan'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-02
Ramku
m
ar Ramachandra
sha1_name:
f
i
x
error messag
e
fo
r
@{<N>}
,
@
{<dat
e
>}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-30
R
am
s
ay J
o
nes
path: Fix a sparse warni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
R
amku
m
ar Ramachandra
push:
m
a
ke pus
h
.
defaul
t
=
cur
r
e
n
t use resolved HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Ra
m
kumar Ramac
h
andra
p
u
sh: fail ear
l
y w
i
t
h
de
t
ached HEAD
a
nd current
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Junio
C
Haman
o
Sync with maint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Junio C Hamano
Start 1
.
8
.
3
.
1 maintenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Junio C Haman
o
Merge branch '
m
aint-1
.
8
.
2'
into maint
commit
|
commitdiff
|
tree
2013-05-29
J
u
n
io C Haman
o
Sta
r
t 1
.
8
.
4
c
ycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Junio
C
Hamano
Me
r
ge br
a
n
c
h 'j
n
/
config-ignore
-
in
a
c
cessible'
commit
|
commitdiff
|
tree
2013-05-29
J
u
nio C Hamano
Merge branch
'
jk/lookup
-
o
b
ject-
p
refer-late
s
t'
commit
|
commitdiff
|
tree
2013-05-29
Jun
i
o C Hamano
M
erge
b
ranc
h
'
j
k/subtr
e
e-do-not-pu
s
h-if-split-fails'
commit
|
commitdiff
|
tree
2013-05-29
Junio C Hamano
M
erge bra
n
ch 'jk/test-output'
commit
|
commitdiff
|
tree
2013-05-29
Jun
i
o C Hama
n
o
Merge
b
r
anch 'rj
/
spars
e
'
commit
|
commitdiff
|
tree
2013-05-29
Junio C
H
amano
M
e
rge
b
ranc
h
'mh/packed-r
e
fs-various'
commit
|
commitdiff
|
tree
2013-05-29
Junio C Hamano
Merge branc
h
'as
/
check-ignore'
commit
|
commitdiff
|
tree
2013-05-29
Junio C Ham
a
no
Mer
g
e branch 'jh/checkout-auto-
t
r
a
cking'
commit
|
commitdiff
|
tree
2013-05-29
Junio C
H
a
m
ano
M
erge branch
'jc/prune
-
all'
commit
|
commitdiff
|
tree
2013-05-29
Junio C
Hamano
M
er
g
e branch
'
mh/fetch-
i
n
t
o
-shallow
'
commit
|
commitdiff
|
tree
2013-05-29
Ju
n
io C H
a
m
a
no
Merge
b
r
a
nc
h
'js/transport-helper-error-
r
eporting-fix'
commit
|
commitdiff
|
tree
2013-05-29
Junio C Hamano
Merge br
a
nch 'fc/transport-h
e
lper-error-reporting'
commit
|
commitdiff
|
tree
2013-05-29
F
elipe Contreras
co
m
pletion: zsh: improve b
a
s
h
script
l
o
ading
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
St
e
fa
n
Beller
archive-zip:w
r
ite_z
i
p_entry: Re
m
ov
e
second
reset of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Ke
n
i
c
hi Saita
difftool --dir-diff: allow changing any clean workin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Ram
k
umar Ramachandra
push: fac
t
or out the detached HEA
D
error messag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Nguyễn Thái Ng
ọ
c Duy
g
et_sha1:
w
arn ab
o
u
t
full o
r
sho
r
t object n
a
mes t
h
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Felipe Contreras
pro
m
pt: fix f
o
r
simple rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Ramkumar Rama
c
handra
re
b
ase: implement --[no-]
a
utostash
a
nd rebase
.
autos
t
as
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-29
Matthieu Moy
git-rem
o
te-mediawiki: better error mess
a
g
e
when HT
T
P
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Phil H
o
rd
tri
v
i
al: Ad
d
mi
s
s
ing per
i
od in
documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
René
S
charfe
com
m
it: don
'
t start ed
i
t
o
r if empty me
s
s
a
ge is giv
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
X
i
d
orn Qua
n
c
redential-osx
k
eychain: s
u
pport more protoc
o
ls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Clemens B
u
chacher
f
i
x segfa
u
lt
with git l
o
g -c --follow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Co
n
treras
send-email: r
e
move warn
i
ng about
u
nset chainrepl
y
t
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Michae
l
Hag
g
e
rty
find_f
i
r
st_merges(): re
m
ove
u
nnecessary code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Michael Ha
g
gert
y
find_firs
t
_merges(): initia
l
i
z
e merges variable usi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
M
i
chael Haggerty
fsck: don't put a void*-shape
d
peg in a char
*
-
sh
a
ped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Mi
c
hael
H
aggerty
object_array_remove_dupl
i
c
a
tes(): rew
r
ite to
reduce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Michael Hagger
t
y
revis
i
o
n
: use obj
e
ct_array_f
i
lter() in implemen
t
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
M
i
chael Hagge
r
t
y
objec
t
_array: add f
u
nc
t
ion object_array_
f
i
l
ter()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Mich
a
e
l Hagg
e
r
t
y
revis
i
on: spl
i
t some ov
e
rly-long lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Michael Hagg
e
rty
c
md_diff():
make it obvious
w
hich
c
a
s
es are exclusiv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Michael H
a
ggerty
cmd_d
i
f
f
():
r
ename
local vari
a
bl
e
"lis
t
"
-
> "entry"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Michael
H
aggerty
c
md_diff(
)
: use an object_array for
holding
t
rees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
M
icha
e
l
H
aggerty
bui
l
tin
_
diff_
t
ree(): make it obvi
o
us that fun
c
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Michael Ha
g
g
e
rty
add_rev_cmdl
i
n
e()
:
m
a
ke a copy of the name argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Michael
H
a
gge
r
ty
fetch: make own copi
e
s
o
f refna
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
M
i
ch
a
el Haggerty
describe: m
a
ke own cop
y
of r
e
fname
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
N
guyễn T
h
ái Ng
ọ
c
Duy
prune-p
a
cked: avoid implying "1" is DRY_R
U
N in p
r
u
ne_
p
ac
k
ed_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
F
elipe Contrer
a
s
t
e
st: rebase
:
f
ix --
i
nteractive t
e
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Feli
p
e Contreras
test:
t
rivial cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Contreras
remote
:
trivial style
clea
n
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Jo
h
n Keeping
fetch: don't t
r
y to
update unfetched
t
racking refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Nguyễ
n
T
h
ái Ngọc Duy
clone: o
p
en
a
sh
o
r
tcut for conne
c
tivity check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Nguyễn Thái Ngọ
c
Du
y
index-pack:
rem
o
ve
dead code (
i
t s
h
ould never
h
appen)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Nguyễn Thái Ng
ọ
c
D
u
y
f
etch-p
a
c
k: pr
e
pare updated shallow file
b
efo
r
e
fetching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-28
Felipe Con
t
reras
remote-hg: add support f
o
r --force
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next