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 'sg/merge-summary-config'
2015-06-16
Junio C Hamano
Merge branch
'
sg/merge-
s
ummary-config'
commit
|
commitdiff
|
tree
2015-06-16
Junio C Hamano
Merg
e
b
r
a
n
ch 'a
h
/sen
d
-email-sen
d
m
a
i
l-a
l
i
as'
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io
C
Ha
m
ano
Second half of seventh batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Merge bra
n
c
h 'tb/complete-sequ
e
n
c
ing'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge
branch 'jk
/
squel
c
h-mi
s
sing-l
i
nk-warning-for-unreacha
b
le'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Hama
n
o
M
e
rge bra
n
ch 'pt/pull-t
e
sts
'
commit
|
commitdiff
|
tree
2015-06-11
J
unio C
H
amano
Merg
e
bra
n
ch 'sb/glossary-submodule'
commit
|
commitdiff
|
tree
2015-06-11
J
u
n
io C
H
aman
o
Me
r
ge branch
'
sb/
s
ub
m
odule-doc-intro'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merg
e
b
r
a
n
ch
'jk/diagn
o
s
e-co
n
f
ig-mmap-fail
u
re'
commit
|
commitdiff
|
tree
2015-06-11
J
u
n
io C H
a
m
a
no
Merge branch 'mt/p4-depotFi
l
e-
a
t-ve
r
s
ion'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merg
e
br
a
n
c
h 'mh/v
e
rify-
l
ock-erro
r
-report'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
H
ama
n
o
Merge branc
h
'jk/color-diff-p
l
ain-is-context'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
M
e
rge branch '
j
k/clone-disso
c
iate'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch 'jc
/
di
f
f-
w
s
-
error-highligh
t
'
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C
Hama
n
o
S
y
nc with 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Git 2
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
The first half of
the seventh batch for 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
Merge branch 'ld/
p
4-
e
ditor-multi-wor
d
s'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ha
m
an
o
Merge branch 'bc/obj
e
ct-id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
a
m
ano
Merge branch 'jk/at-push-sha1'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branch 'dl/branch-e
r
ror-message'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
branch 'jk/s
k
ip-h
t
tp-tests-un
d
er-no-curl' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C H
a
mano
Merge branch 'p
s
/doc-p
a
ck
f
il
e
-vs-
p
ack-file'
i
nt
o
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
ge br
a
nch '
f
g/d
o
cume
n
t-commit-message-strippin
g
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
m
a
no
Mer
g
e branch 'j
k
/rerer
e
-forget-check-enabled' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
erge branch
'pt/pull-lo
g
-
n
' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
M
e
rge branch 'pt
/
pull-ff-
v
s-mer
g
e-ff' into maint
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C
Hamano
Merge branch
'
r
s
/
plug-leak
-
in-pack-bitmaps' into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o C Hamano
M
erge branch 'ja/tutorial-asciid
o
c
t
or-fix
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge b
r
anch 'jk/strip
s
p
a
c
e-asc
i
idoctor-fi
x
' into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
H
amano
Merg
e
branch 'j
k
/asciidoc-markup
-
fi
x
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
r
a
nc
h
'
p
s/bundle
-
ve
r
ify-arg' into
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merg
e
br
a
n
ch
'
m
h
/write-refs-soone
r
-2
.
4'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C
H
amano
M
e
rge bra
n
c
h
'mh/ref-directory-file' into main
t
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Hamano
Mer
g
e branch 'mg/l
o
g-decorate-
H
EAD' i
n
to maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branc
h
'sb/t1020-cleanup' int
o
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
ni
o
C
Hamano
Merge branch
'jc/gi
t
ignore-pr
e
cedence'
i
nto maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch
'
bc/connect-p
l
ink' i
n
to
maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Ha
m
ano
Merge branch 'ph/r
e
base-
i
-redo'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branch 'jk/add-e-kill-edit
o
r' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
r
a
n
ch
'
mh/clo
n
e-ve
r
bosity-f
i
x'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C H
a
mano
Merge branch '
j
k/sha1-fi
l
e-reduc
e
-useless-
w
arn
i
n
g
s
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Me
r
g
e b
r
anch
'
tb/blame-resurre
c
t-co
n
vert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ham
a
no
Merge
branch
'
j
c
/plug-fmt
-
m
e
r
g
e-msg-leak' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Haman
o
Me
r
ge
b
ranch 'pt/xdg-co
n
fig-path' int
o
maint
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Six
t
h batch fo
r
2
.
5 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
J
un
i
o
C Hamano
Merge
b
ranch 's
b
/tes
t
-b
i
tmap
-
f
r
ee-a
t
-end'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge br
a
nch 'mm
/
re
b
ase-i-post
-
rewrite
-
exec'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
ama
n
o
Merge branch 'f
m
/
f
etch-
r
aw-sha1
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge
b
ranch 'sg/
h
elp-group'
commit
|
commitdiff
|
tree
2015-06-01
J
u
ni
o
C Hamano
Merge bran
c
h
'
m
m
/
l
og-format
-
raw-d
o
c'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch
'dt/cat-file-follow-symlinks'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hama
n
o
Merge
branch 'rs/janitorial'
commit
|
commitdiff
|
tree
2015-06-01
J
unio C Hamano
Merge branch
'
jk/stash-options'
commit
|
commitdiff
|
tree
2015-06-01
J
u
nio C Hamano
Merge
b
ranch 'da/mergetool-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Ham
a
no
Merge branch
'mc
/
commit-doc-
g
ramm
o
fix
'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch
'jh/
f
ilter-empty-
c
o
n
tents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
am
a
no
Merge
b
r
a
nch 'ah/
u
sage-strings'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'jk/http-bac
k
end-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ha
m
ano
Merge br
a
n
c
h
'dt/clea
n
-pathspe
c
-filter
-
then-lstat'
commit
|
commitdiff
|
tree
2015-06-01
J
e
f
f King
suppress errors on missi
n
g UNINTERESTING
l
in
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff
K
i
ng
silen
c
e br
o
ken
link warnings wit
h
rev
s
->ignor
e
_missing_
l
i
nks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Jeff Kin
g
add
quieter versions of parse_{tree,c
o
mmit}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-06-01
Thomas Braun
c
o
m
p
letion
:
suggest
s
e
quencer comman
d
s for revert
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Stefan Bel
l
er
glossa
r
y
:
add "remot
e
", "
s
ubmod
u
l
e", "superproje
c
t"
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520: check reflog
action
in fast-forward merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
u
l
Tan
t552
1
:
test --dry
-
r
u
n does not
make any chang
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul Tan
t5520
:
test --rebase
failure on unborn branch wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Pa
u
l Tan
t5520: te
s
t --
r
ebase wi
t
h
multipl
e
branches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
P
a
ul Tan
t5520: test work
t
r
e
e
fast-forward
w
hen
f
etch updat
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-29
Paul
T
an
t
5
520: test fo
r
fai
l
ure if index has unresolved entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Stefan
Belle
r
sub
m
o
dule doc
:
reord
e
r introd
u
cto
r
y
p
a
ragr
a
p
h
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
S
Z
E
D
ER Gábor
Documentation:
in
c
lude 'merge
.
branchdesc' fo
r
merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
J
u
nio
C
H
amano
xmmap(): d
r
o
p
"
O
ut of memory?
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
c
o
nfig
.
c: r
e
w
rite ENODEV into EIS
D
I
R when mmap
fai
l
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
J
eff Ki
n
g
config
.
c: avoid
x
m
ma
p
error
messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jef
f
King
config
.
c
:
fix mmap leak when
w
riting config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-28
Jeff King
read-
c
a
c
he
.
c
: drop PROT_W
R
ITE from mmap
o
f i
n
de
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mi
g
uel
T
orr
o
ja
p
4: retr
i
eve
t
he right revi
s
ion
of the file in UTF
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael
Haggerty
re
f
_t
r
an
s
acti
o
n_commit
(
)
:
do not capitalize erro
r
messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Mich
a
el Hagg
e
r
ty
veri
f
y
_
loc
k
(): d
o
not
capitalize error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
M
ichael
H
aggerty
verify_lock(): re
p
or
t
e
r
r
o
r
s
via
a s
t
rbuf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff
.
h: rename DIF
F
_PLA
I
N color sl
o
t
to DIFF_CONTEXT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
diff: a
c
cep
t
color
.
d
i
f
f
.
conte
x
t
as a syn
o
nym f
o
r
"
p
l
ain
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
u
nio C Hamano
Merge branch 'nd/untracked-cache
'
commit
|
commitdiff
|
tree
2015-05-27
Jeff King
t7
0
63:
hide stder
r
fro
m
setup inside prereq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
t9001: write $HOM
E
/, n
o
t
~
/, to help shells without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Alle
n
Hubbe
send
-
email: ad
d
sen
d
mail email aliases format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Hagge
r
ty
verify
_
lock
(
)
:
on errors, let
the caller
unlock t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Michael Haggerty
verify_lock(): re
t
urn
0
/-
1
rather than struct ref_lock *
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
e
f
f Ki
n
g
clone: reorder --d
i
s
soci
a
te and --reference optio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Jeff Kin
g
clo
n
e: use
O
PT_STRING
_
LIS
T
for --referen
c
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
Junio C Ham
a
no
diff
.
c: --ws-error-highlight=<
k
ind> option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-27
J
u
n
io C Hamano
diff
.
c: add em
i
t
_
del_line() and emit_context_line()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
J
u
n
i
o
C
H
am
a
no
Sync wi
t
h 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o C H
a
man
o
Git 2
.
4
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
M
erge branch 'jk/still-inte
r
esting' in
t
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C
H
amano
Merge branch 'jc/hash-object' int
o
maint
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merg
e
b
r
a
nch 'jk/rebase-quiet-noop
'
i
nto maint
commit
|
commitdiff
|
tree
2015-05-26
J
unio C Haman
o
Merge bran
c
h 'sg
/
complete-decorate-full-not-long' into
.
.
.
commit
|
commitdiff
|
tree
next