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
Sync with maint
2015-08-19
J
u
nio C Hamano
S
ync with mai
n
t
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Fourth
b
at
c
h for 2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Junio C
H
amano
Merge
b
ra
n
c
h 'tb/comp
l
ete-rebase-i-ed
i
t-
t
od
o
'
commit
|
commitdiff
|
tree
2015-08-19
J
unio C Hamano
Merge branch 'jk
/
git-path'
commit
|
commitdiff
|
tree
2015-08-19
Junio
C Ha
m
ano
Merge
branch '
j
c
/
f
i
nalize-
t
emp-file'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Ham
a
n
o
Mer
g
e b
r
anch
'
p
s
/gu
e
ss-repo-name-at
-
root'
commit
|
commitdiff
|
tree
2015-08-19
J
unio C Hamano
M
erge branch 'jk/
g
uess-rep
o
-name-re
g
re
s
sion-fix'
commit
|
commitdiff
|
tree
2015-08-19
Ju
n
io
C
Ham
a
no
Me
r
ge branc
h
'
j
k
/nega
t
i
ve-hiderefs'
commit
|
commitdiff
|
tree
2015-08-19
Junio
C Hamano
Merge br
a
n
ch 'jk/tes
t
-with-x'
commit
|
commitdiff
|
tree
2015-08-19
Junio
C
Haman
o
Merge bran
c
h
'ps/
t
1509-chroot-t
e
st-fixu
p
'
commit
|
commitdiff
|
tree
2015-08-19
J
u
nio
C
Hamano
Merge bran
c
h 'sb/che
c
k
-
retur
n
-
f
rom-read-ref'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge bra
n
c
h
'mm/pull-upload-pack'
commit
|
commitdiff
|
tree
2015-08-19
Junio C Ham
a
no
Start preparing for 2
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-19
Jun
i
o
C
Hama
n
o
Me
r
ge bran
c
h 'ta/docfix-index-form
a
t-tech
'
into main
t
commit
|
commitdiff
|
tree
2015-08-19
Junio
C Hamano
Me
r
g
e
b
ranc
h
'sb/parse-o
p
t
ions-codefo
r
mat' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Mer
g
e bran
c
h '
s
b/
r
emove-un
u
sed-var-from-b
u
iltin-add
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio C
H
amano
Merge br
a
n
c
h
'kn/tag-doc
-
fix' into maint
commit
|
commitdiff
|
tree
2015-08-19
Junio
C
H
a
ma
n
o
Merge branch 'e
s
/do
c
-cle
a
n-outd
a
t
e
d-tools' into mai
n
t
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merg
e
bran
c
h 'nd
/
ex
p
ort
-
work
t
ree' i
n
to maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C H
a
m
a
no
Merge branch 'mh/fast-impo
r
t
-optimize-c
u
rrent-from
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio C
Ha
m
a
no
Merge branch 'ib/scripted-parse-opt-bette
r
-h
i
nt-string
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
J
unio C
Hamano
Merge bra
n
ch
'se/doc-checkout-
o
urs-theirs' in
t
o maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge branch 'cb/uname-in-untrack
e
d'
int
o
m
a
int
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge br
a
nch 'as/sparse-
c
heckout-re
m
oval' into main
t
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
Merge
b
ranch 'd
b
/send-pack-u
s
er-s
i
gningkey'
i
nto maint
commit
|
commitdiff
|
tree
2015-08-19
Junio C Hamano
M
e
r
ge branch 'jx/d
o
-no
t
-cra
s
h-r
e
ceiv
e
-pack-wo
-
head
.
.
.
commit
|
commitdiff
|
tree
2015-08-19
Junio C H
a
mano
Me
r
ge
b
ran
c
h '
d
a/
s
ubtree-date-confusion' into
m
aint
commit
|
commitdiff
|
tree
2015-08-17
Junio C Hamano
Third
b
atc
h
for 2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-17
J
u
nio C
Hamano
Mer
g
e bran
c
h 'dt/untracked-s
p
arse
'
commit
|
commitdiff
|
tree
2015-08-17
Junio
C H
a
mano
Merge branch 'ta/docfi
x
-inde
x
-
form
a
t-tech'
commit
|
commitdiff
|
tree
2015-08-17
J
u
ni
o
C Hamano
Merge branch 'mh/ge
t
-remote-g
r
oup-fix'
commit
|
commitdiff
|
tree
2015-08-17
Junio C
H
a
m
an
o
M
e
r
ge
b
r
a
nch 'kd/pull
-
r
e
bas
e
-autos
t
a
sh'
commit
|
commitdiff
|
tree
2015-08-12
Jun
i
o C Hamano
S
econ
d
b
a
t
ch
f
or
2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-12
J
u
nio
C
Ham
a
no
Merge
b
ranch 'sb/rem
o
ve-unused-var-fro
m
-builtin-add'
commit
|
commitdiff
|
tree
2015-08-12
Junio
C
Hamano
Me
r
ge branch 'sb/p
a
rse-options
-
codeforma
t
'
commit
|
commitdiff
|
tree
2015-08-12
J
unio C
Hamano
Merg
e
b
r
anc
h
'dt/unpack-trees
-
cache-tree-reval
i
d
a
te
'
commit
|
commitdiff
|
tree
2015-08-12
Junio C
Haman
o
Merg
e
branch 'dt
/
reflog-tests
'
commit
|
commitdiff
|
tree
2015-08-12
Junio C
H
a
ma
n
o
M
erge branch 'e
s
/workt
r
ee-add-cleanup'
commit
|
commitdiff
|
tree
2015-08-12
Junio
C
H
a
m
ano
Mer
g
e
branch '
p
t
/am
-
b
uiltin
'
commit
|
commitdiff
|
tree
2015-08-12
Junio C Hamano
M
erge branch
'es/worktree-add'
commit
|
commitdiff
|
tree
2015-08-12
Ju
n
io C Ham
a
n
o
Merge b
r
anch 'ad/bisect-clean
u
p'
commit
|
commitdiff
|
tree
2015-08-10
Jeff King
memoize
common git-path "c
o
nstant" files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
J
e
ff Ki
n
g
g
et
_
r
e
p
o
_path: refa
c
tor path-allocatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
J
eff King
find_ho
o
k: ke
e
p our
ow
n
static
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff K
i
ng
refs
.
c: remove_em
p
ty_d
i
rectorie
s
c
an take a strbu
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff
K
ing
refs
.
c:
av
o
id gi
t
_path as
s
i
g
n
ment
i
n lock_ref_s
h
a1_basic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
J
e
ff King
refs
.
c: avoid rep
e
ated git_
p
ath c
a
lls in rename_tmp
_
log
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff King
refs
.
c
: simplify s
t
r
bufs i
n
re
f
log se
t
up and writing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff King
path
.
c: d
r
op git_path_submodul
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff Ki
n
g
refs
.
c: remove
extra git_path c
a
lls from read_loose_refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff Kin
g
r
e
m
ote
.
c: drop extraneous local v
a
riable from mi
g
rate_f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff King
prefer mkpathdup to mkpath in assignme
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff
K
ing
pre
f
er git_path
d
up
to g
i
t_p
a
th in so
m
e
p
o
ssibly
-
dangerous
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff Ki
n
g
add_to_alternate
s
_file: don't add duplicate
entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
J
e
f
f King
t5700: modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
J
e
ff King
c
ache
.
h: complete se
t
of
g
it_path_sub
m
odu
l
e hel
p
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jef
f
K
ing
cache
.
h: clari
f
y
documentation
f
or git_
p
ath
,
e
t
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Junio C Ham
a
no
sha1_file
.
c: re
n
ame move_temp_to_f
i
l
e
() to f
i
nal
i
ze
_
object_
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Patrick Steinh
a
rdt
clone: ab
o
r
t
i
f
no
dir
n
a
m
e
could be gu
e
ssed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Patrick Steinhardt
clo
n
e: do not use
port
n
umb
e
r as dir name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
P
a
trick
Steinhardt
clone:
d
o
not
includ
e
authen
t
i
cation data
i
n guessed dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff
K
ing
clone: use co
m
p
u
t
ed
l
ength in guess_di
r
_name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-10
Jeff King
cl
o
ne:
a
d
d tests for o
u
tput directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-07
Jeff King
test
-
l
i
b
:
disable
t
ra
c
e when test is
not
v
e
r
bose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-07
Jeff
K
ing
test-lib: turn off "-x" tr
a
cin
g
during c
h
a
i
n-lint
c
h
eck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-07
Jef
f
King
refs: support ne
g
ati
v
e
transfe
r
.
hideRefs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Tho
m
as Brau
n
com
p
letion: offer '
-
-edit-todo' during interactive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pat
r
ick
S
tei
n
hardt
tests: fix cl
e
anup after tests
i
n t1509-root-wor
k
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Patrick
S
tei
n
h
ardt
tests: f
i
x broken &&
c
hains in t1509-root-work
t
ree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Patr
i
ck Stei
n
ha
r
dt
D
oc
u
mentation
/
git-worktree: fix duplic
a
t
e
d
'
fr
o
m'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Remi
L
e
s
pinet
git
-
am
:
add am
.
threeWay config variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
b
uiltin-a
m
: remove
redire
c
tion
to
g
i
t-am
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin
-
am: c
h
eck for
v
ali
d
c
o
mmit
t
er
i
d
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bui
l
tin-a
m
: imple
m
ent lega
c
y -b/--
b
inary option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
buil
t
in-a
m
:
i
mple
m
ent -
i
/--interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-a
m
:
support an
d
auto-detec
t
mercur
i
al patches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
b
u
iltin-am: supp
o
rt and auto-de
t
ect StGit series files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: support and aut
o
-det
e
ct
St
G
it patches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: rerere support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
b
u
i
l
t
in-am: i
n
voke post-a
p
ply
p
a
tch hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am
:
invoke pre-applyp
a
tch hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-a
m
:
invoke applypatch-msg
h
ook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
i
n-am: sup
p
ort
au
t
omatic
n
o
tes copyi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: invo
k
e post-rewrite hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am: implement -S/--gpg-
s
ig
n
,
commit
.
gpgsign
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
built
i
n-am: impl
e
ment --committer
-
date-is-author-date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-am: implement
--ignore-date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am: pass g
i
t-apply's options t
o
gi
t
-app
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
au
l
Tan
b
uiltin-am: imple
m
ent --[no-]scissors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am:
s
upp
o
rt --k
e
ep-cr,
a
m
.
k
e
e
p
cr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
an
builtin-am: implement --[no-]messa
g
e-id, a
m
.
mess
a
geid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul
T
an
builtin
-
a
m: implement
-
k/--keep,
-
-
k
eep-
n
o
n-pat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am:
i
mple
m
en
t
-u/--ut
f
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builti
n
-
am: ha
n
dle str
a
y state directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin
-
a
m
:
b
y
p
ass git
-
mailinfo
w
hen --reb
a
sing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul T
a
n
b
uiltin-am: implement --rebasi
n
g mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
builtin-am: imp
l
e
ment --
3
way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
cache-tree: introduce write_index_as_tr
e
e(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
l
tin-am: impleme
n
t -s/-
-
si
g
noff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: exit with user friendl
y
m
e
s
s
a
g
e on failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next