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
Prepare for 2.8.2
2016-04-15
Junio C Hamano
Prepare
for 2
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-15
Ju
n
i
o C
Hamano
Merge branch 'jv/merge-nothing-into-
v
oid' into maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C
Ha
m
ano
Merge
branch 'ss/commit-
s
q
u
a
s
h-
m
sg
'
into
m
aint
commit
|
commitdiff
|
tree
2016-04-15
Junio C
H
amano
Mer
g
e branch 'jk/send-email-rtrim-mailrc-alias' into
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
J
u
n
i
o
C H
a
mano
Merge br
a
n
ch 'd
a
/
m
erget
o
ol-delete-delete-con
f
lict'
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hama
n
o
Merge branch 'jk
/
startup-info'
int
o
maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C
Hamano
Merge branch 'jk/g
e
twh
o
leline-
g
etdelim-empty
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
J
u
nio C H
a
mano
Merge branch 'rj/xdiff-p
r
epare-plug-leak-on-erro
r
-codepath
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
J
u
n
i
o C Hamano
Merge
b
ranc
h
'gf/fetc
h
-pack-d
i
rect-object-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
J
u
ni
o
C Hamano
Merge branch 'jk/rev-parse-local-env-vars' into m
a
int
commit
|
commitdiff
|
tree
2016-04-15
Jun
i
o C Haman
o
M
erge
b
ranch 'jk/config-get-urlmatch' into maint
commit
|
commitdiff
|
tree
2016-04-15
J
u
n
io C
H
amano
Merg
e
branch 'pb/t7502-d
r
op-
d
up' into
maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Merge bran
c
h 'jk/test-httpd-
c
onfig
-
nosy
s
tem' into main
t
commit
|
commitdiff
|
tree
2016-04-15
Junio C Ha
m
ano
Merge branch 's
b
/clone-t57-t56' into maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C
H
a
m
ano
M
e
r
ge branch 'jk/cred
e
ntial-cache
-
comment-exit' into
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Merge branc
h
'jc/ind
e
x-
p
ac
k
'
into maint
commit
|
commitdiff
|
tree
2016-04-15
Juni
o
C Hamano
Merge branch
'
ss
/
exc
-
f
lag-i
s
-a-col
l
ection-of-bits
'
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Juni
o
C Hamano
Merge
b
ranch 'mp/up
l
oad-pack-use-emb
e
dded-args' into
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
J
u
nio C Hamano
Merge branch 'oa/doc-diff
-
check' int
o
maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C
H
am
a
no
M
e
rge branch 'p
b
/opt-cmdmode-doc' int
o
maint
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Me
r
g
e
bra
n
ch 'nd/app
l
y-doc' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2016-04-15
Junio C Hamano
Merge branch
'
cc/doc-recommend
-
p
e
rformanc
e
-t
r
ace-to
.
.
.
commit
|
commitdiff
|
tree
2016-04-15
Junio
C
Hama
n
o
Merge branch 'mm
/
lock
f
ile-error-message' into maint
commit
|
commitdiff
|
tree
2016-04-13
Juni
o
C Hamano
Start
pre
p
aring for 2
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-03
J
u
nio C Hamano
Git 2
.
8
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-04-03
Junio C Hamano
Merge
branch 'mm/readm
e
-markdown' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2016-04-03
Ma
t
thieu Mo
y
g
it
.
spec
.
in: us
e
REA
D
ME
.
md, no
t
READ
M
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-29
Ori Avtal
i
on
Docume
n
tation:
git diff --check detects conf
l
ict markers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-28
Junio
C Hamano
Git 2
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-25
P
r
a
nit B
a
u
v
a
api-parse-options
.
txt: document
OP
T
_
C
MDMODE()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-24
Junio
C
Hamano
Me
r
g
e
branch 'l
s
/p4-doc-markup'
commit
|
commitdiff
|
tree
2016-03-24
Junio
C
H
amano
Merge branch 'js/mingw-test
s
-
2
.
8'
commit
|
commitdiff
|
tree
2016-03-24
Junio C Hamano
Merge branch 'sb
/
subm
o
dule-m
o
dule-
l
i
st-pathspec-fix'
commit
|
commitdiff
|
tree
2016-03-24
Nguyễn
Thái Ng
ọ
c
D
u
y
gi
t
-apply
.
tx
t
: mention
t
he
be
h
avi
o
r ins
i
de a sub
d
ir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-24
N
g
u
y
ễn Thái Ngọc
Duy
git-
a
pply
.
t
x
t: remove
a
space
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
J
u
n
i
o C
H
amano
Merge branch '
m
aster' of gi
t
://github
.
c
om/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2016-03-23
Junio
C
Hamano
mer
g
e: fix NU
L
L po
i
nter der
e
ference when me
r
g
ing
n
othing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Lars Schneider
Documentation
:
fix git-p
4
AsciiD
o
c form
a
tt
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Joh
a
n
n
es Schindelin
min
g
w: skip
s
ome tests in t9115 due to file
n
ame
issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Johannes Schind
e
lin
t1300: fix the new --show-orig
i
n t
e
st
s
on Windo
w
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Johan
n
es Schi
n
delin
t
1300-repo-config: make i
t
resil
i
ent
t
o
being r
u
n
via
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Johannes
S
chindelin
c
o
nfig --sho
w
-origin: report paths with
forward slashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-23
Ste
f
an Beller
su
b
module: fix regressi
o
n fo
r
d
eini
t
wi
t
h
out
s
ubmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
S
v
e
n
S
trickroth
comm
i
t: d
o
not lose SQUASH_
M
SG con
t
ents
Test by
Junio C Hamano
<gitster@pobox.com>.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Junio C
Hamano
G
it 2
.
8-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Junio C Ham
a
no
Sync with maint
commit
|
commitdiff
|
tree
2016-03-21
Junio C Ha
m
ano
Merge branch 'mm/doc-hook
s
-linkgit-fix'
into maint
commit
|
commitdiff
|
tree
2016-03-21
Ma
t
thieu Moy
Do
c
u
mentatio
n
: fix broken
l
inkgit to g
i
t
-co
n
f
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
L
a
rs Schneider
Do
c
umentation: use ASC
I
I quo
t
atio
n
marks in git
-
p
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Junio C Hama
n
o
Merge branch '
t
b/avoid-
g
cc-on-da
r
win-
1
0-
6
'
commit
|
commitdiff
|
tree
2016-03-21
Er
i
c Sunshine
Revert "c
o
nfig
.
mak
.
uname: use c
l
an
g
fo
r
Mac
O
S
X 10
.
6
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
J
uni
o
C
Ham
a
n
o
M
erg
e
branch
'
es
/
st-add4-gcc-4
.
2-
w
or
k
aroun
d
'
into maint
commit
|
commitdiff
|
tree
2016-03-21
Eric Suns
h
ine
git-co
m
p
a
t-util: st
_
add4: work a
r
o
u
nd gcc 4
.
2
.
x compil
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-21
Ju
n
io C H
a
m
ano
M
e
rg
e
tag 'l10n-2
.
8
.
0-
r
nd3' of git://github
.
c
o
m
/
git
.
.
.
commit
|
commitdiff
|
tree
2016-03-21
Junio C Hamano
Merge branch
'
mas
t
er' of git://ozlabs
.
o
rg/~paulus/gi
t
k
commit
|
commitdiff
|
tree
2016-03-18
J
e
ff King
t/lib-httpd: pass through GIT_CONFIG_NOSYST
E
M env
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
J
e
f
f
King
credential-cache--d
a
emon: cl
a
rify
"
exit" action semantics
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
Jeff K
i
n
g
send-email: ignore tra
i
l
i
ng wh
i
t
e
space in mai
l
rc alias
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
J
unio C
H
a
m
an
o
Rel
N
otes: remove the mention o
f
!re
i
ncl
u
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-18
Juni
o
C
Ham
a
no
Revert "Merge branch
'
n
d
/
e
xclus
i
on-reg
r
essi
o
n
-
f
i
x'"
commit
|
commitdiff
|
tree
2016-03-18
Junio C Ham
a
no
Revert
"Me
r
ge b
r
a
n
ch 'jc/exclusion-doc'"
commit
|
commitdiff
|
tree
2016-03-17
Junio C Hama
n
o
Sync with Git 2
.
7
.
4
commit
|
commitdiff
|
tree
2016-03-17
Junio C
H
am
a
n
o
Git 2
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-17
Junio
C Hama
n
o
Syn
c
with Gi
t
2
.
6
.
6
commit
|
commitdiff
|
tree
2016-03-17
J
u
n
io C H
a
man
o
Git 2
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-17
Juni
o
C Hamano
Merge branch '
m
aint-2
.
5'
i
nt
o
m
a
in
t
-2
.
6
commit
|
commitdiff
|
tree
2016-03-17
Ju
n
io C
Hamano
Git 2
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-17
J
u
n
io C Hama
n
o
Me
r
ge branch
'
maint-2
.
4
' into maint
-
2
.
5
commit
|
commitdiff
|
tree
2016-03-17
Junio C
H
a
mano
Git 2
.
4
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-17
J
u
nio C Hamano
Mer
g
e branc
h
'jk/
p
ath-name-safety-
2
.
4
' into
maint-2
.
4
commit
|
commitdiff
|
tree
2016-03-16
Junio C Hamano
Git 2
.
8-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-16
Juni
o
C
H
amano
M
e
rg
e
branch '
m
aster' of git://bogomips
.
o
r
g
/git-s
v
n
commit
|
commitdiff
|
tree
2016-03-16
Junio C Hamano
Sync wit
h
mai
n
t
commit
|
commitdiff
|
tree
2016-03-16
Junio C Hamano
Merge branc
h
'jc
/
sa
n
e-grep
'
commit
|
commitdiff
|
tree
2016-03-16
Junio C Ham
a
no
Merge bra
n
ch 'cn/deprecate-s
s
h
-
g
i
t-u
r
l'
commit
|
commitdiff
|
tree
2016-03-16
Junio C Hamano
Merge b
r
anc
h
'jk/pat
h
-name
-
s
afety-2
.
7' into maint
commit
|
commitdiff
|
tree
2016-03-16
Jun
i
o C H
a
mano
Merge branch 'jk/p
a
th-n
a
me
-
safety-2
.
6' into jk/path
.
.
.
commit
|
commitdiff
|
tree
2016-03-16
Junio
C
Hamano
Merge branch 'jk/
p
ath-name-saf
e
ty-2
.
5'
i
n
to jk/p
a
th
.
.
.
commit
|
commitdiff
|
tree
2016-03-16
Jun
i
o C H
a
mano
Merge branch 'jk/path-name-saf
e
ty-2
.
4' int
o
jk/pa
t
h
.
.
.
commit
|
commitdiff
|
tree
2016-03-16
Jeff King
list-object
s
: pass full
p
at
h
name to callbacks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-16
Jeff King
list
-
objects: drop name_path
e
ntirely
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-16
Jeff King
list-object
s
:
c
onvert name_pa
t
h to a strbu
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-16
Jeff King
show_obj
e
ct_with
_
name: sim
p
lif
y
b
y
using path
_
name(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-16
Jeff
King
add
helpers for detecting size_t overflow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-16
Jeff King
h
ttp
-
push:
s
top usi
n
g name_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-16
Jeff Ki
n
g
tree-diff: catc
h
inte
g
er overflow i
n
c
o
mbine_diff_pat
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-16
St
e
fan Beller
cl
o
ne tests
:
rename t57* => t56*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Ha
m
ano
R
e
lNotes for 2
.
8
.
0:
t
ypofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-15
Junio C Hamano
Merge bra
n
c
h
'svn-g
l
ob' of git://bogomip
s
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2016-03-15
Ju
n
i
o
C Hamano
Merge tag 'l10n-2
.
8
.
0-rnd2' of git://
g
ithub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2016-03-14
Junio C
H
amano
M
er
g
e branch 'mg/wt-status-m
i
smarked-i18
n
'
commit
|
commitdiff
|
tree
2016-03-14
M
i
ch
a
el J
Gruber
wt-status: allow "ahead "
to b
e
p
i
cked up by l10n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-11
Prani
t
B
a
u
v
a
t/t7502
:
dro
p
duplicate test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-10
J
u
n
i
o C Hamano
reb
a
s
e
-i: clar
i
fy "is this commit releva
n
t?" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-10
Junio
C
Hamano
sane_grep:
pass "-a" if
grep accepts it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-10
David Ag
u
ilar
mergetool: honor
t
empfile
configuration when res
o
lving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-10
Da
v
id A
g
u
ilar
m
e
r
g
eto
o
l: supp
o
rt delete/delete confl
i
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-10
Junio C Hamano
Git 2
.
8-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-03-10
Ju
n
io C Hamano
Sync with 2
.
7
.
3
commit
|
commitdiff
|
tree
2016-03-10
Junio C
Hamano
G
i
t 2
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next