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
builtin-am: implement --[no-]scissors
2015-08-05
Paul Tan
builtin-am: impl
e
ment --[n
o
-]sciss
o
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
b
u
ilt
i
n-a
m
: support --keep-
c
r
,
am
.
kee
p
cr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
ui
l
tin-
a
m: imple
m
e
nt -
-
[no-]m
e
ssage-
i
d,
a
m
.
messagei
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
Tan
b
u
ilti
n
-am: implement -k/--ke
e
p, --keep-non-patc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am:
i
mp
l
e
me
n
t -u
/
--utf
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-a
m
: handle s
t
ray state
d
irectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: bypass git-m
a
ili
n
fo when --reba
s
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-
a
m: implement
--re
b
asing
mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: implem
e
nt
-
-
3
way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
cach
e
-tree:
i
n
troduce write
_
i
n
dex_as_
t
ree(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Ta
n
b
uiltin-am: implement
-s/--
s
ignoff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am:
ex
i
t
w
ith user friendly message on fail
u
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
built
i
n-am: implement
-
q
/
-
-
q
u
ie
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am:
r
eject pat
c
hes when
th
e
re'
s
a
session in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
buil
t
in-am
:
i
m
pl
e
ment -
-
abort
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
bu
i
l
tin-am: implement --s
k
ip
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-a
m
: don
'
t p
a
rse mai
l
when resumin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bui
l
tin-am:
impl
e
ment --resolv
e
d/--continue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am
:
r
e
fuse to apply pa
t
ches i
f
index is
d
irt
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
Ta
n
built
i
n
-
am:
i
mplement committin
g
applied pat
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
buil
t
i
n-a
m
: a
p
ply patch
w
ith
g
it-apply
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
uiltin-am: e
x
tract
patch
a
nd c
o
mmit info w
i
th 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
a
u
l
T
an
builtin-
a
m:
aut
o
-detect 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
P
a
ul
Tan
builtin-a
m
: split out mbox
/
mai
l
d
i
r patch
e
s
wi
t
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
Paul Tan
built
i
n-am: implement patch queue
mechanism
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
bu
i
ltin
-
am: implem
e
n
t
s
ke
l
etal builtin 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
: implement xfopen()
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
an
wrapper: imp
l
ement xopen()
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merg
e
br
a
nc
h
'jk/date-mode-f
o
rma
t
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
a
mano
M
e
r
g
e
branch 'pt/am-test
s
'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C H
a
mano
Merge branch '
s
g/
b
a
s
h-p
r
ompt-untracked-o
p
t
i
m'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merg
e
branch 'cb/unam
e
-i
n
-untracked'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C H
a
ma
n
o
Merge branch 'se/
d
o
c-ch
e
ck
o
ut
-
o
urs-theirs'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch
'
ib/scripted-
p
arse
-
op
t
-better-hin
t
-stri
n
g'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
io C
Hamano
Merge br
a
nch 'mh/fas
t
-impor
t
-opt
i
m
ize
-
c
urrent-from'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge bra
n
ch '
k
n/tag-doc-fi
x
'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Ham
a
n
o
Me
r
ge branch
'mh/fast-import-get-mark'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Merge branch 'gr/rebase
-
i-drop-warn'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
amano
Merg
e
branch 'jc/co
m
mit-slab'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Ha
m
ano
Merge
branch 'dt/lo
g
-follo
w
-config'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o
C
Ha
m
ano
Merge bra
n
ch 'gp/st
a
tus-rebase-i-in
f
o'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hama
n
o
M
e
rge br
a
nch
'jk/cat-fil
e
-batch-a
l
l'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge bran
c
h 'js/
f
sck-opt'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
Merge branch '
m
h/in
i
t-delete-ref
s
-
api'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Merge b
r
anch 'pt/pull-builti
n
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Me
r
g
e branch 'jk/pkt-log-pack'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Merge
b
ranch 'mr/rebase-i-customize-insn-sheet'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merg
e
branch 'rl/
s
e
n
d-email-aliases'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge branch 'kb/
i
1
8n
-
d
oc'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
erge
b
r
a
nch '
n
d/e
x
port-wor
k
tree'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Haman
o
Mer
g
e bra
n
c
h 'ee/c
l
ean-remove-
d
irs'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
an
o
M
e
rge bran
c
h
'cb/par
s
e-magnitude'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
a
mano
Merge
b
ranc
h
'
b
c
/
gpg-
v
erify-raw'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
amano
M
erge bran
c
h 'pt/a
m
-foreign'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Ha
m
ano
Merge
bra
n
ch 'kn/for-
e
ach-ref
'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C H
a
mano
Me
r
ge
b
ra
n
ch 'mh/replace
-
refs'
commit
|
commitdiff
|
tree
2015-08-03
Kart
h
ik Naya
k
ref-fi
l
ter
:
make
'
ref_array_item' us
e
a FLEX_ARR
A
Y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
Kar
t
h
ik
Nayak
for-each-ref: introduce filter_re
f
s()
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: m
o
ve code from
'
for-each-ref'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C Hamano
Git 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Hamano
Sync with 2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
G
it 2
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
Merge b
r
a
n
ch 'jk/p
r
ett
y
-encodi
n
g
-doc'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Merge b
r
an
c
h 'tb/ch
e
ckout
-
d
oc
'
in
t
o maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Ha
m
a
no
Merge br
a
nch 'ls/hint-rev-list-c
o
un
t
'
into
ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hama
n
o
Me
r
ge branch 'mm
/
b
r
anch-d
o
c-updates' i
n
to
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge bran
c
h
'
jc/fsck-ret
i
re
-
requir
e
-e
o
h'
i
nt
o
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Merge bra
n
ch
'et
/
h
ttp
-
proxyauth' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch 'j
c
/
u
n
e
xport-git-
p
ager-in-us
e
-in-pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio
C H
a
ma
n
o
Merge branch '
m
h/strbuf-r
e
ad
-
file-
r
eturns-ssize-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
Merge
b
r
a
nch 'kb/c
o
nfig-un
m
ap-befor
e
-
renaming'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
e
rge branch 'jk/rev-list-no
-
bi
t
map-whi
l
e
-pr
u
n
i
ng'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Merge branch 'rh
/
test-
c
olor
-
a
void-t
e
rmin
f
o-in-origina
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Ha
m
ano
Merge branc
h
'jk/f
i
x-refresh
-
utime' i
n
to maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
Merg
e
br
a
nch 'cb/rebase-a
m
-
e
xit-code' into
mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Merge bra
n
ch 'jk/in
d
e
x-pack-r
e
duce-rec
h
eck' into
mai
n
t
commit
|
commitdiff
|
tree
2015-07-24
J
u
nio C Ha
m
ano
R
elNotes: am
.
thr
e
e
W
ay
does
n
ot exi
s
t (yet)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
Revert "gi
t
-
am: add am
.
threeW
a
y co
n
f
ig
v
ariable"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Hamano
Git 2
.
5
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
Junio C
H
amano
Mer
g
e branch 'tf/
g
itweb-typof
i
x'
commit
|
commitdiff
|
tree
2015-07-21
Junio
C
Hama
n
o
Mer
g
e tag 'l10
n
-2
.
5
.
0-rnd2' of git://github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Jeff King
strbuf: make
s
trbuf_addftime more r
o
bus
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
SZED
E
R Gábor
bash prompt: faster untra
c
ked status
in
d
icator with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
SZED
E
R
Gábor
bash prompt: te
s
t u
n
t
r
a
cked fil
e
s status indica
t
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901: test git-am
en
c
odin
g
convers
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l
T
an
t3418: no
n
-
i
nteracti
v
e reb
a
se --continue with rer
e
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t4150:
t
ests for am --[no-]
s
cissor
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Tan
t
4150: am with post-ap
p
lypatch hook
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l
Tan
t4150: am with
p
re-
a
ppl
y
p
a
tch hook
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with a
p
plypatch-msg h
o
ok
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am --resolved f
a
ils if
i
ndex h
a
s unmerged entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am --resol
v
ed f
a
ils
i
f ind
e
x
h
a
s
no
c
hanges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Ta
n
t4150: am refuse
s
patches when paused
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
151: am
--abort will keep dirty index intact
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l
Tan
t4150: am fai
l
s if index
is dirty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-17
Ch
a
rles
Bailey
u
n
tra
c
ked:
f
ix detect
i
on of uname(2) failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-17
J
u
nio C Hama
n
o
M
erge branch 'j
k
/sti
l
l-int
e
resti
n
g
'
commit
|
commitdiff
|
tree
2015-07-17
Junio C H
a
ma
n
o
Merge br
a
nch 'es/worktree-add
'
commit
|
commitdiff
|
tree
2015-07-17
E
r
ic Sunshin
e
D
o
cu
m
entation/
g
i
t
: fix st
a
le "M
U
LTIPLE
CHECKOUT M
O
DE
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-16
Junio C Hamano
worktree: caution
that this is still experimental
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next