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 'da/user-useconfigonly'
2016-04-29
Jun
i
o C Haman
o
Merge b
r
anch 'da
/
user
-
useconfigonl
y
'
commit
|
commitdiff
|
tree
2016-04-25
Junio C Hamano
Sync wi
t
h ma
i
nt
commit
|
commitdiff
|
tree
2016-04-25
Junio C Ha
m
ano
Seve
n
th batch
for
pos
t
2
.
8
c
ycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-25
J
u
n
i
o C H
a
mano
Merge br
a
nch 'sb
/
submodule-path-mi
s
c-bugs'
commit
|
commitdiff
|
tree
2016-04-25
Junio
C Hamano
Merge
b
ranch 'en/merg
e
-tr
i
vial-fix'
commit
|
commitdiff
|
tree
2016-04-25
Junio C Hamano
Me
r
g
e
branch 'en/merge-octopus-fix'
commit
|
commitdiff
|
tree
2016-04-25
Junio
C
Hamano
Merg
e
bran
c
h 'dt/pre-refs-backend
'
commit
|
commitdiff
|
tree
2016-04-25
J
u
nio C
H
a
m
a
n
o
Merge branc
h
'jc/rer
e
re-multi'
commit
|
commitdiff
|
tree
2016-04-25
Junio C
H
amano
Mer
g
e tag 'l10
n
-
2
.
8
.
0-rnd3-fr' of git://git
h
ub
.
com
.
.
.
commit
|
commitdiff
|
tree
2016-04-22
J
un
i
o
C Hamano
Sixth batch
f
or post 2
.
8 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-22
Junio C H
a
mano
M
erge branch 'ad/cy
g
win-wants-rename'
commit
|
commitdiff
|
tree
2016-04-22
Junio
C
H
a
mano
M
e
rge bran
c
h 'jk/
u
se-wri
t
e-sc
r
i
pt-m
o
re'
commit
|
commitdiff
|
tree
2016-04-22
J
u
nio C Hama
n
o
Me
r
g
e branch 'jk/do-
n
ot-printf-N
U
L
L
'
commit
|
commitdiff
|
tree
2016-04-22
Junio C Hamano
Me
r
ge bran
c
h 'jc/http-so
c
ks
5
h'
commit
|
commitdiff
|
tree
2016-04-22
J
unio C Hamano
M
e
rge branch
'
ky
/
i
m
ap-send-openssl-
1
.
1
.
0'
commit
|
commitdiff
|
tree
2016-04-22
Junio C Hamano
Mer
g
e branch 'ky/i
m
ap-send'
commit
|
commitdiff
|
tree
2016-04-22
Junio C H
a
mano
Merge branch 'jc/xs
t
rfmt-null-with-p
r
ec-0'
commit
|
commitdiff
|
tree
2016-04-22
J
u
ni
o
C
Hamano
Merge br
a
nch 'a
d
/c
o
mmit-have-m-option
'
commit
|
commitdiff
|
tree
2016-04-22
Junio
C
Ha
m
ano
Merge b
r
anch 'ew/send-e
m
ail-drop-
d
ata-dum
p
e
r'
commit
|
commitdiff
|
tree
2016-04-22
Junio
C
Haman
o
M
er
g
e br
a
nch 'ew/s
e
nd-email-
r
eadab
l
e-message-id'
commit
|
commitdiff
|
tree
2016-04-22
Ju
n
io
C
H
a
m
ano
Merge branch
'sb/submodule-he
l
pe
r
-
c
l
one-regressio
n
.
.
.
commit
|
commitdiff
|
tree
2016-04-18
J
unio C Ha
m
ano
Fi
f
th ba
t
ch for post 2
.
8 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-18
Junio
C
Hama
n
o
Merge branch 'jk/branch-sho
r
tening-
f
unny-symr
e
fs'
commit
|
commitdiff
|
tree
2016-04-18
Junio C Hamano
Merge b
r
anch 'ky/br
a
nch-m-w
o
rktr
e
e
'
commit
|
commitdiff
|
tree
2016-04-15
J
u
ni
o
C Haman
o
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hama
n
o
Prepare for 2
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-15
J
unio
C
Hamano
Merge branch 'jv/merge-noth
i
ng-into-void' into m
a
int
commit
|
commitdiff
|
tree
2016-04-15
Junio C
H
amano
Merge branch 'ss/co
m
mit-squash-msg'
into maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
M
e
r
ge br
a
n
c
h
'j
k
/send-ema
i
l-rtrim-mailrc-
a
lias' into
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio
C
Hamano
Merge br
a
nch 'da/mer
g
etoo
l
-de
l
ete-delete
-
conflict'
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
J
u
n
i
o
C
H
amano
M
er
g
e bran
c
h 'jk/
s
tartup-i
n
fo' into maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Merge bran
c
h 'jk/get
w
holeline-g
e
tdelim
-
empt
y
' into
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio
C
Ham
a
no
M
erge br
a
nch 'rj/xd
i
f
f
-prep
a
r
e
-plug-leak-on-error-codepath
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
M
e
rge branch 'gf/fetch-pack-di
r
ect-o
b
j
ect-fetc
h
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Merge br
a
nch 'jk/rev-parse-
l
ocal-env-vars' into mai
n
t
commit
|
commitdiff
|
tree
2016-04-15
Juni
o
C Hamano
Merg
e
branch 'jk
/
conf
i
g-ge
t
-u
r
lma
t
ch'
into maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Merge
b
ranch 'pb/
t
7502-drop-dup' into maint
commit
|
commitdiff
|
tree
2016-04-15
Junio
C Hamano
Merge branch 'jk/test
-
htt
p
d-confi
g
-nosy
s
tem' in
t
o maint
commit
|
commitdiff
|
tree
2016-04-15
Junio
C Ha
m
ano
Merg
e
branch 'sb/clone-t5
7
-t5
6
' into
m
aint
commit
|
commitdiff
|
tree
2016-04-15
Ju
n
io C Ha
m
ano
Me
r
ge br
a
nch 'jk
/
cred
e
ntial-c
a
c
he-comment-
e
xit'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio C Ham
a
no
Merg
e
branch 'jc/index-p
a
ck' into maint
commit
|
commitdiff
|
tree
2016-04-15
Ju
n
i
o C
Hamano
M
erge branch 'ss/ex
c
-
flag-is-a-co
l
lection-of-bits'
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Jun
i
o C Hamano
Merge
b
ranch
'
mp/upl
o
a
d
-p
a
c
k
-use-
e
m
b
ed
d
ed-
a
r
g
s'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio C Haman
o
Merge b
r
anch 'oa/doc-diff-ch
e
ck'
into
m
a
int
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Merge branch 'pb
/
opt-cmdmo
d
e-doc'
i
nt
o
maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hama
n
o
Me
r
ge branch 'nd/app
l
y-
d
oc' into ma
i
nt
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Merge b
r
anch 'cc/
d
oc-rec
o
mm
e
nd-performance-tr
a
ce-to
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Merg
e
bra
n
ch 'mm/lockfile-error-mes
s
a
ge' int
o
maint
commit
|
commitdiff
|
tree
2016-04-13
Juni
o
C Hamano
Start
p
r
eparin
g
for 2
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-13
Kazuki Ya
m
aguc
h
i
imap-
s
e
nd:
fix CRAM-MD5 res
p
onse calcul
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-13
Kazuki
Y
amaguchi
imap-sen
d
: check for NOLO
G
IN
c
apability only when usi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-13
Junio C Hamano
Fou
r
th batch f
o
r post
2
.
8 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-13
J
unio C Ha
m
an
o
Merg
e
bra
n
ch 'tb/blame
-
f
o
rce-r
e
ad-cache-to-work
a
roun
d
.
.
.
commit
|
commitdiff
|
tree
2016-04-13
Junio C Hamano
Merge branch 'mg/
c
omplete-cherry-ma
r
k-to-log'
commit
|
commitdiff
|
tree
2016-04-13
Junio C Ham
a
no
Merge branch 'ep/tra
c
e-doc-samp
l
e-
f
i
x
'
commit
|
commitdiff
|
tree
2016-04-13
Jun
i
o C Hamano
Merge branch 'jc/makefil
e
-
redir
e
ction-std
e
rr'
commit
|
commitdiff
|
tree
2016-04-13
Junio
C
Hamano
M
erge branch
'
l
t
/pretty-
e
x
p
and-tabs'
commit
|
commitdiff
|
tree
2016-04-13
Junio C
H
a
m
an
o
Mer
g
e branch 'm
j
/
pull-reb
a
se-autostash'
commit
|
commitdiff
|
tree
2016-04-13
Jun
i
o
C
H
a
mano
Merge branch
'
jn/m
e
rgeto
o
l
s
-examdiff'
commit
|
commitdiff
|
tree
2016-04-13
Junio C H
a
mano
Merge branch 'es/format
-
patch-d
o
c-h
i
de-no-patch
'
commit
|
commitdiff
|
tree
2016-04-13
J
unio C Hamano
M
e
rge branch
'j
s
/mingw-tests-2
.
8'
commit
|
commitdiff
|
tree
2016-04-13
Junio C Haman
o
Merge br
a
nch 'cc
/
apply'
commit
|
commitdiff
|
tree
2016-04-13
Jun
i
o C H
a
mano
Mer
g
e branch
'sb/misc-clea
n
u
p
s'
commit
|
commitdiff
|
tree
2016-04-13
Junio C Hamano
M
erge bran
c
h 'sk/send-pack-all-fix'
commit
|
commitdiff
|
tree
2016-04-13
Juni
o
C Ham
a
n
o
Merge branch 'sg/diff-multiple-identica
l
-renames'
commit
|
commitdiff
|
tree
2016-04-13
Junio C
H
amano
Merg
e
branch 'kn/for-eac
h
-t
a
g-branch'
commit
|
commitdiff
|
tree
2016-04-13
Jun
i
o C
H
amano
Merge branch
'k
y
/b
r
anch-d-worktree'
commit
|
commitdiff
|
tree
2016-04-13
Jun
i
o
C Hamano
Merge
bra
n
ch 'rz
/
w
orktree
-
no
-
checkout'
commit
|
commitdiff
|
tree
2016-04-13
Junio C Hamano
Me
r
ge
b
ranch 'r
t
/rebase-i-sh
o
rten-stop-report'
commit
|
commitdiff
|
tree
2016-04-13
Junio C H
a
mano
Me
r
ge branch
'
rt/co
m
pletion-help'
commit
|
commitdiff
|
tree
2016-04-13
Junio C Hamano
M
e
rge bra
n
ch
'
a
k/us
e
-hashmap-iter-first-in
-
submodule
.
.
.
commit
|
commitdiff
|
tree
2016-04-13
Junio
C Hamano
Merge branch 'j
k
/chec
k
-repository-f
o
rma
t
'
commit
|
commitdiff
|
tree
2016-04-13
E
l
i
j
ah Newren
merge-octopus: abort if index do
e
s n
o
t match HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
a
h
Newren
t6044: new
merge testcases f
o
r w
h
en index doe
s
n't match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
builtin/merg
e
.
c: fix a bug with trivial merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h Newren
t
7
6
05: add a t
e
st
c
ase demonstrating a bug with triv
i
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-12
Junio C Hamano
t3
4
0
4: use
w
rite_script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-11
Junio C Hamano
t1020:
d
o not overuse printf
a
n
d
us
e
wri
t
e
_
script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Jeff Ki
n
g
t55
3
2: use wri
t
e
_
s
cript
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Davi
d
Turner
refs: on
s
ymref refl
o
g expire,
l
ock sym
r
ef not referrent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
David
Turner
refs: move resolve_re
f
_
unsafe i
n
t
o
comm
o
n code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Mic
h
ael Ha
g
gerty
s
h
ow_head_ref():
c
h
eck the resu
l
t of resolve
_
ref_namespace()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michael H
a
g
gerty
check_aliased
_
update(): check that dst_na
m
e is no
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
M
i
chae
l
Hagge
r
ty
checkout_paths():
r
em
o
ve un
n
eeded fla
g
variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Micha
e
l
Hagger
t
y
cmd_mer
g
e(): rem
o
ve unneeded
fla
g
var
i
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
M
ichael Ha
g
ge
r
ty
f
s
ck
_
head_l
i
nk
(
):
r
emov
e
unneeded flag variabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michael Hagge
r
ty
re
a
d_raw_ref():
c
h
a
nge fla
g
s
pa
r
amet
e
r to
u
n
s
igned in
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michael Hagg
e
rty
f
iles-bac
k
end: inline resolve_ref_1
(
)
into
r
es
o
l
v
e_ref
_
unsafe
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Mich
a
e
l Hagger
t
y
read_
r
aw_re
f
(): manag
e
own scratch space
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
David Turner
f
i
les-bac
k
end: brea
k
out ref reading
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michael
H
ag
g
erty
r
es
o
lve_ref_1
(
): elimina
t
e lo
c
a
l
variab
l
e
"ba
d
_
n
ame"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Mi
c
hael Haggerty
r
e
solve_r
e
f_1(
)
: reorder code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michael Haggert
y
resolve_re
f
_
1
(): eliminate local
variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Micha
e
l Hagge
r
t
y
resolve_re
f
_unsaf
e
(
): en
s
ure flags is
always set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michael H
a
gger
t
y
resol
v
e_ref_unsafe(): use for loop to count
u
p to MAXD
E
P
T
H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michae
l
Haggerty
resolv
e
_missing_loose_ref(): simplify semantics
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michael Ha
g
gerty
t1430: improve te
s
t coverage o
f
del
e
tion of
badl
y
-named
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michael
H
ag
g
erty
t
1430:
t
es
t
for
-
e
a
ch-ref
i
n
the pres
e
nc
e
o
f
bad
l
y-named
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
M
ich
a
el Hagge
r
ty
t1
4
30:
d
on't rely on symbo
l
ic
-
ref for creati
n
g broken
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-10
Michael Hagge
r
ty
t1430: c
l
ea
n
up broken
refs/tags/shadow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next