repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sb/submodule-config-cleanup'
2016-12-08
S
t
ephan Beyer
a
m: change safe_to_abort()'s
not r
e
winding error into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-08
Stephan Beye
r
am: fix
f
ilename in
s
afe_to_abort() error m
e
ssage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-07
Nguyễ
n
Thái N
g
ọc Du
y
shallow
.
c: remove useless code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-07
Ras
m
us V
i
l
lemoes
s
h
allow
.
c
:
bi
t
manipulation tweaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-07
Ras
m
us
V
illemoes
shallow
.
c:
avoid
t
he
o
re
t
ic
a
l p
o
inter
w
rap-arou
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-07
Nguyễn Thái Ngọc
D
uy
shal
l
ow
.
c:
make paint_a
l
loc
s
li
g
h
tly more robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-07
Nguyễn Thá
i
Ngọc Duy
shallow
.
c: stop
abusing COMMIT_SLAB_SIZE for paint_info
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-07
Nguyễn Thái N
g
ọc Duy
shallow
.
c: re
n
ame
f
iel
d
s in paint_info to
better e
x
p
r
ess
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-07
Ju
n
io C H
a
m
ano
lockfile: L
O
CK_RE
P
ORT
_
ON_
E
RROR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-07
Junio C Hama
n
o
h
o
ld_lock
e
d_i
n
dex(
)
:
a
lign er
r
or handling with hold_lo
c
k
file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-07
J
u
nio C Hamano
w
t
-status: impl
e
ment op
p
ortunis
i
tc index update c
o
rrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-06
Jeff King
s
t
ash: pr
e
fe
r
plumb
i
ng over g
i
t-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-06
Jeff Ki
n
g
xdi
f
f: drop XDL_FAST_HASH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-06
J
eff King
h
ttp-walker: complain ab
o
ut non
-
404 loose
object error
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-06
Junio C Hamano
Mer
g
e branch
'
ew/http-wa
l
ker' into jk/http-walker-lim
i
t
.
.
.
commit
|
commitdiff
|
tree
2016-12-06
J
eff King
ht
t
p: treat http-alte
r
nates like redir
e
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-06
Jeff King
http: make red
i
rects more obvious
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-06
Jeff King
remote-c
u
r
l
: rename shadowed
o
pti
o
ns variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-06
J
e
f
f King
h
t
tp: always update the base
U
RL for
redirect
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-06
Jef
f
Kin
g
http: simplify update_url_
f
rom_
r
e
d
i
r
e
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-06
Ramsa
y
Jones
GIT-VERSION
-
GEN: do n
o
t force abb
r
evia
t
ion length used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
N
guy
ễ
n Thái Ngọc
Duy
tag, b
r
anch, for-each-ref:
a
dd --ignore-ca
s
e f
o
r
so
r
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Lars Schneider
t0021: m
i
nor
f
il
t
er pro
c
e
s
s
test cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
L
ars Schne
i
der
git-p4: fix
empty file proc
e
ssing for large file system
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Lars S
c
h
n
eid
e
r
t
r
avi
s
-ci: upd
a
te P4 to 16
.
2 and GitLFS to 1
.
5
.
2 in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
La
r
s Sch
n
eider
g
it-p
4
:
add config
t
o retry p
4
commands
;
re
t
ry 3 times
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Alex
Henrie
clone,fetch:
e
xplain the shallow-clone option a
li
t
tle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Alex Henrie
receiv
e
-pa
c
k: improve Engl
i
s
h
gra
m
m
a
r of den
y
Cu
r
r
e
ntBranch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Alex
Henrie
bisect: impro
v
e Englis
h
gr
a
mmar
of not-ances
t
ors message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Luke Diamand
git
-
p4: support updating an exi
s
ti
n
g
s
helved changel
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
And
r
eas
Krey
commit: make --o
n
ly
-
-allow-emp
t
y w
o
rk without paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Stefan Beller
t3600: remove useless redi
r
ect
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Stefan Beller
u
n
pac
k
-trees:
fix grammar
f
or un
t
racked files
in di
r
ec
t
o
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Ju
n
io C Hamano
Start post 2
.
11 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
Jun
i
o C Hamano
Sync with maint
-
2
.
10
commit
|
commitdiff
|
tree
2016-12-05
J
un
i
o C
H
am
a
no
p
r
e
paring for 2
.
10
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-05
J
unio
C
H
a
m
ano
Merge branc
h
'jk/common-m
a
in' int
o
main
t
-2
.
1
0
commit
|
commitdiff
|
tree
2016-12-01
T
o
r
sten Bögershaus
e
n
convert: git
c
her
r
y-pick -X
r
enormalize did not work
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-12-01
J
u
nio C Hamano
M
e
rge branch
'
tb/t0
0
2
7-raciness-fix' into jc/renormalize
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Ju
n
io C Hamano
p
u
ll
:
fast-
f
o
r
ward "pull -
-
rebas
e
=true"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
Jonathan T
a
n
sequencer: use trailer's trailer layout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
J
o
nathan Tan
t
r
ai
l
e
r
: hav
e
function
t
o descri
b
e trailer layout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
Jonathan Tan
trailer:
avo
i
d unnecessary splitting on lin
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
J
o
nathan Tan
commit
:
m
a
ke igno
r
e_non_trailer take buf/len
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
Jonathan Tan
trailer: be
s
tricter in parsing separators
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
Junio C Hamano
Mer
g
e branch 'tk/dif
f
core-de
l
ta-remove
-
unus
e
d' into
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Juni
o
C Hamano
Merge branch 'jk/create-branch-remove-unused-param
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Junio C
Hamano
Merge branch
'nd/worktree-lock'
i
nto m
a
int
commit
|
commitdiff
|
tree
2016-11-29
Junio C Hamano
Me
r
g
e
branch '
p
s/com
m
on-i
n
fo-doc' into maint
commit
|
commitdiff
|
tree
2016-11-29
J
u
nio C
Hamano
Merge
branch 'r
s
/cocci' into m
a
i
n
t
commit
|
commitdiff
|
tree
2016-11-29
Junio
C Hama
n
o
Merge br
a
nc
h
'
n
d
/
test
-
h
e
lpers' into maint
commit
|
commitdiff
|
tree
2016-11-29
Juni
o
C
H
amano
Merge branch
'sc/fmt-merge-msg-doc-marku
p
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Junio
C Hamano
Merge branch 'rs/commi
t
-pptr-sim
p
lif
y
' into maint
commit
|
commitdiff
|
tree
2016-11-29
J
u
nio C Ham
a
n
o
M
erg
e
branch 'jk/reb
a
se-config-insn-fmt-docfix' into
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Junio C
H
amano
Merge br
a
nch 'ak/pr
e
-recei
v
e-h
o
ok-template-modefix
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Junio
C Hamano
Merge
branch '
l
s/mac
o
s-update
'
into maint
commit
|
commitdiff
|
tree
2016-11-29
Ju
n
io C Haman
o
M
e
rge branch 'as/merge
-
attr-s
l
eep'
into maint
commit
|
commitdiff
|
tree
2016-11-29
Junio C Ha
m
a
no
Mer
g
e
b
r
a
n
ch 'ak
/
sh
-
setup-dot-source-i18n-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Jun
i
o
C Hamano
M
erge
branch 'jk/daemon-path-ok-
c
heck-truncation'
into
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Junio C Hamano
M
e
rge branch
'
rs/ring-b
u
ffer-wraparo
u
nd' into
maint
commit
|
commitdiff
|
tree
2016-11-29
Junio C Hamano
Merg
e
branch 'mm/send-email-cc-cruft-after-address
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Jun
i
o C Hamano
Merge bra
n
ch 'cp/comple
t
i
o
n-negative-refs' into maint
commit
|
commitdiff
|
tree
2016-11-29
Junio C Hamano
Me
r
g
e branc
h
'
j
c/am-read-author
-
file' into maint
commit
|
commitdiff
|
tree
2016-11-29
Jun
i
o
C
H
a
mano
Git 2
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
Junio
C
Hamano
Merge branch '
j
k
/
common-main
'
commit
|
commitdiff
|
tree
2016-11-29
Junio C Ha
m
ano
Merge ta
g
'l10n-2
.
11
.
0-r
n
d3
.
1' of git://github
.
com
.
.
.
commit
|
commitdiff
|
tree
2016-11-29
Jeff
K
ing
com
m
on-main: stop
mu
n
ging argv[0] pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
Jef
f
King
t7610
:
clean up f
o
o
.
XXXXXX tmp
d
ir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
Vinicius Ku
r
sancew
g
it-p4:
allow submit to
crea
t
e
shelved changelists
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
D
a
v
i
d Aguilar
m
e
rget
o
ols/vi
m
diff: trust Vim's ex
i
t code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-29
Da
v
id A
g
uilar
mergetool: honor mergetool
.
$tool
.
trustExitCode fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-28
Marc Bra
n
c
h
aud
Rel
N
o
t
es: spelli
n
g and phrasing fixups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-28
Ng
u
yễn Thái Ngọc Duy
m
er
g
e-recur
s
ive
.
c:
use s
t
r
ing_list_sor
t
instead of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-28
Junio
C Hamano
Mer
g
e tag 'l10n-2
.
11
.
0-r
n
d3' of git://github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2016-11-28
Nguy
ễ
n Thái Ngọc Du
y
worktree list:
k
eep t
h
e l
i
st sorted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-28
Nguyễn Thái Ngọc Duy
worktree
.
c:
g
et_w
o
rktrees() take
s
a
n
ew flag ar
g
um
e
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-28
Nguy
ễ
n Th
á
i Ngọc Duy
g
et_worktrees() mu
s
t return
main workt
r
ee as
first
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-28
Nguyễn
T
hái Ngọc Duy
work
t
re
e
: reorder an if stateme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-28
Johan
n
es Schi
n
d
el
i
n
merge-
r
ecursive:
handle NULL in add_
c
acheinfo()
cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-28
Joh
a
nnes S
c
hindelin
ch
e
r
r
y-pic
k
:
d
emonstrat
e
a segmentation fau
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-23
Junio C H
a
m
ano
Git 2
.
11-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-23
Junio C
H
amano
Merge branch 'jc/setup-
c
leanup
-
fix'
commit
|
commitdiff
|
tree
2016-11-23
Juni
o
C Hamano
M
e
rge branch
'
jt/trailer-with-cruft'
commit
|
commitdiff
|
tree
2016-11-23
Jun
i
o C Hamano
Merge
b
ranch 'js/rebase-i-com
m
entchar-fix'
commit
|
commitdiff
|
tree
2016-11-23
Junio C H
a
mano
Merge
b
ranch 'jc/
f
o
r
-each-ref-head-segfault-fix'
commit
|
commitdiff
|
tree
2016-11-23
Nguyễn Thái
Ngọc Duy
workt
r
e
e
.
c:
z
ero new 'struc
t
worktree' on alloc
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-23
Bran
d
on
W
illia
m
s
pu
s
h
:
fix
-
-dry-r
u
n
to
no
t
push su
b
m
o
d
u
le
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-23
Brandon
Williams
push: -
-
dry-run updates sub
m
odules w
h
en --r
e
curse-su
b
mod
u
les
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-22
Stefan Beller
submodul
e
-config: clarify
p
arsing of null_sha1 element
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-22
Stefan Bel
l
er
s
u
bmodu
l
e-config: rename
c
ommit_sha1 to treeish_n
a
me
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-22
S
tefan Bel
l
er
submodule config: inline config_from_
{
name,
path
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-22
Junio
C Ha
m
ano
Me
r
ge
t
ag 'l10n-2
.
11
.
0-r
n
d
2
'
of git://gith
u
b
.
c
o
m
/git
.
.
.
commit
|
commitdiff
|
tree
2016-11-22
Jun
i
o C Haman
o
M
erge br
a
nch 'js/prepare
-
sequen
c
e
r
'
commit
|
commitdiff
|
tree
2016-11-22
Jun
i
o C Ha
m
ano
archi
v
e
:
r
ead lo
c
al configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-22
Junio
C
Hamano
mailinfo: read local conf
i
g
u
ra
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-21
Jonatha
n
Tan
d
o
c: mention user-configu
r
ed tra
i
lers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-21
Johannes Schindelin
rebas
e
-i: handle
core
.
c
o
mmentChar=a
u
to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-21
Johan
n
es Schindelin
stripspace: respe
c
t
r
epos
i
tory conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-21
Joha
n
nes Schinde
l
i
n
rebase -i:
h
ighlight pr
o
blems with core
.
c
o
mme
n
tchar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2016-11-21
Jiang
X
in
i18n: fix
u
nmatched
single quote in e
r
ror message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next