repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pt/am-builtin'
2015-08-12
Junio C H
a
mano
Merge
b
ranch 'pt
/
am-builtin'
commit
|
commitdiff
|
tree
2015-08-12
Junio C Ha
m
ano
Merge branch 'es/worktree-add'
commit
|
commitdiff
|
tree
2015-08-12
Junio C
H
amano
Merge branch 'ad/bisect-cleanup'
commit
|
commitdiff
|
tree
2015-08-05
Remi Lespinet
git-am: add am
.
th
r
e
e
W
ay config variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
ilt
i
n
-
am: r
e
move red
i
rection
t
o git-am
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am
:
ch
e
ck for val
i
d comm
i
t
ter i
d
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
b
u
iltin-am: implemen
t
legacy
-b/--bin
a
ry o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l T
a
n
builtin-am: implement -i/--interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builti
n
-
a
m: s
u
pp
o
rt
a
n
d
auto-d
e
tec
t
mercurial pa
t
ches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: support and auto-detect StGit
s
eries files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
ltin-am: support and auto-d
e
t
e
ct StGit patches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Tan
buil
t
in-a
m
:
r
erere s
u
ppo
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
b
ui
l
tin-am: invoke post-a
p
p
l
ypa
t
ch h
o
ok
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
built
i
n-am:
i
n
voke pre-a
p
plypatch hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
buil
t
in
-
am: invoke applypatch-msg ho
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am: support a
u
t
o
m
atic note
s
copyin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin
-
am: invoke
p
ost-rewrite
h
oo
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
builtin-am: implement
-S/--
g
p
g
-sign, com
m
it
.
gpgsi
g
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-am
:
im
p
l
ement --
c
ommitter-date-is-author-da
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
builtin-a
m
:
impleme
n
t --ign
o
re-date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
bui
l
tin-am: pa
s
s git-app
l
y's options to git-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
b
u
iltin-am:
imple
m
ent
--[no-]
s
cissors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builti
n
-am: support --keep-cr, am
.
keepcr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
T
a
n
bu
i
ltin-am: impl
e
ment -
-
[
no-]mess
a
g
e
-
id, am
.
m
essageid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
buil
t
in-am: implement
-
k
/
--
k
eep, -
-
keep-n
o
n-
p
atch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
l
t
in-am
:
i
m
plement -u/--u
t
f8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am:
h
andle stray s
t
ate directo
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: bypas
s
gi
t
-mailinfo whe
n
-
-
r
e
basing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uil
t
in-am: i
m
plement
-
-reba
s
ing mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement
--3w
a
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
cach
e
-tree: introduce writ
e
_index_
a
s_
t
r
ee()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builti
n
-am: implemen
t
-s/--sig
n
of
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
b
u
iltin-am: exit w
i
th
user friendly m
e
ss
a
ge
o
n failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-am: implemen
t
-q/--quiet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: reject
patch
e
s when there's a ses
s
ion in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
buil
t
i
n-am: imple
m
ent --ab
o
rt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
i
ltin-a
m
: implement --skip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: don't parse
mail wh
e
n
resumi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: i
m
p
lem
e
nt
-
-r
e
solved/--continue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
ui
l
tin-am: refuse to apply patches
i
f index is dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
lti
n
-am: impl
e
men
t
com
m
itti
n
g appl
i
ed patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: apply p
a
tch with git-
a
pp
l
y
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am:
e
xtract patch and commit info with git
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
bu
i
lti
n
-am: auto-d
e
tect mbox patches
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-am
:
sp
l
it out
m
b
ox
/
m
a
i
l
dir
patches wit
h
git
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
b
uil
t
i
n-am: imple
m
ent patch qu
e
ue m
e
ch
a
nism
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: im
p
l
ement
s
ke
l
etal buil
t
in am
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
wrappe
r
:
i
mplement xfopen()
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
wra
p
per: implement xopen()
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Matthieu Moy
bisect: don't
mix o
p
tion
p
a
r
sing
and
n
on-trivial
c
ode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Antoine D
e
lai
t
e
bisect: simplify the addition of new bis
e
ct te
r
ms
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
J
unio
C
Ham
a
no
Sync w
i
th maint
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
F
irst b
a
tc
h
for 2
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C
Ham
a
no
Mer
g
e
b
ranch 'e
s
/doc-clean-outdated-to
o
ls'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Hamano
Merge branch 'jk/refspec-par
s
e-wild
c
ard'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
M
erge bran
c
h
'
da/subtre
e
-date-confu
s
ion
'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hama
n
o
Merge bran
c
h '
j
x/do-not
-
crash-r
e
cei
v
e-pa
c
k-wo-head'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merg
e
b
r
anch '
d
b/send-pa
c
k-user-signing
k
e
y
'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
Mer
g
e branch 'zb/us
e
r
diff-fountain'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Merge
b
r
anch 'dt/ref
s
-bac
k
end
-
pr
e
amble'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
i
o
C Ham
a
no
M
e
r
ge
b
ra
n
ch 'as/spars
e
-
c
heckout-removal'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
ano
Merge branc
h
'jk/date-mode-format'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
i
o
C Hamano
Merge bran
c
h 'pt/am-tests'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o
C
H
amano
Merge branch 'sg/bash-prompt-unt
r
acked-optim'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
M
erge branch
'cb/u
n
ame-in-u
n
tracked'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
aman
o
Merge branc
h
'se/doc-chec
k
o
u
t-ours-t
h
eirs'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge branch 'ib/scripted-parse-opt-better-hint-str
i
ng'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Merge
b
r
a
n
c
h 'm
h
/f
a
st-import-optimize-current-from
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge
b
ranch 'kn/tag-do
c
-fix'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
Mer
g
e branc
h
'mh/f
a
st-impo
r
t-g
e
t-mark'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hama
n
o
Merge bran
c
h 'gr/rebase-i-dro
p
-
warn'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
a
mano
M
e
rge
branch 'jc/commit-slab'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
M
e
rge
branch '
d
t
/
log-follow-c
o
nfig'
commit
|
commitdiff
|
tree
2015-08-03
J
uni
o
C Hama
n
o
Merg
e
bra
n
ch 'gp/status-rebase-i-info'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Merge b
r
an
c
h '
j
k/cat-file-batch-all
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge
bra
n
c
h
'js/fsck
-
op
t
'
commit
|
commitdiff
|
tree
2015-08-03
J
uni
o
C
Hamano
M
e
rge branch 'mh/init-delete
-
r
e
f
s-api'
commit
|
commitdiff
|
tree
2015-08-03
J
unio
C Hamano
Merge b
r
anch
'
pt/
p
ull-bu
i
ltin'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
aman
o
Merge
b
ra
n
ch '
j
k/pkt-log-pack'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Ham
a
no
Merge branc
h
'mr/reba
s
e-i-c
u
stomiz
e
-i
n
sn-
s
he
e
t
'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o
C Hamano
M
e
rge
branch 'rl/send-email-ali
a
ses'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
a
m
a
no
M
e
rge br
a
n
ch 'kb/i18n-doc'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge bra
n
ch
'
nd/export-worktre
e
'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C H
a
mano
Merge b
r
anch
'
e
e/clean-
r
em
o
ve-di
r
s'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'cb/parse
-
magnitude'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
ano
Merge branch
'
bc/
g
pg-verif
y
-r
a
w'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
rge branch 'pt/am-foreign'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
M
e
r
ge branch 'kn/
f
or
-
each-ref'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merg
e
branch 'mh/replace-refs'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Sync with 2
.
4
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C
H
a
m
ano
Git 2
.
4
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
rge branc
h
'js/rebase-i-clean-
u
p-
u
pon-con
t
inue-to
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Ha
m
ano
Merge branch 'ss/clone-gue
s
s-dir-na
m
e-si
m
plify' into
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
a
no
M
erge
b
ranch 'sg/comp
l
etion-
c
omm
i
t
-
cleanup' into maint
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge bra
n
ch
'pt/am-a
b
o
r
t-fix' into
m
a
int
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
io
C
Hama
n
o
Merge br
a
nch
'
mh/re
p
orting-broken
-
refs-from-for-eac
h
.
.
.
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branc
h
'sg/commit-c
l
eanup-scissors' in
t
o main
t
commit
|
commitdiff
|
tree
2015-08-03
Karthik
Nay
a
k
ref-filter:
m
ak
e
'ref_array_i
t
e
m
'
us
e
a FLEX_ARRAY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karthik
N
ayak
for-each-ref
:
intro
d
uce filte
r
_refs()
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karthik Nayak
ref-filter: move code fr
o
m 'for-each-ref'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next