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
builtin-am: implement -k/--keep, --keep-non-patch
2015-08-05
Paul Tan
builtin-am: imple
m
ent -k/
-
-keep, --keep-non-patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
iltin-am: implement -u/--
u
tf8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
built
i
n-am: handle stray state directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
t
in-am: bypass git
-
mailinfo when --
r
ebasin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am: implement --re
b
asing mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
buil
t
in-am:
i
m
p
lement --3way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
T
an
ca
c
he-
t
ree: introduce write_i
n
d
e
x_as_
t
r
ee()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: im
p
l
ement
-s/--sign
o
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
u
l
T
a
n
builtin-am: ex
i
t
with user friendly
m
essage on
f
ail
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
b
u
i
l
tin-am: implement -q/--qu
i
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: reject
p
a
t
ches wh
e
n there's a session in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
buil
t
in-am: implement --abor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-
a
m: im
p
le
m
en
t
--
s
k
ip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
builtin-
a
m
:
don't
p
a
rse mail whe
n
resum
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uiltin-am: implem
e
n
t --resolved
/
--continue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-a
m
: refuse to ap
p
ly patch
e
s if inde
x
is dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
b
uiltin-
a
m:
implement committi
n
g appli
e
d patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
bu
i
ltin-am: apply
patch with gi
t
-
a
p
ply
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-am
:
ext
r
act pa
t
ch
and com
m
it info with
g
it
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
T
a
n
builtin-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
Tan
builtin-a
m
: split out mbox/maildir patch
e
s
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
Paul Tan
builtin-am
:
i
m
ple
m
en
t
p
atch que
u
e 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 T
a
n
builtin-a
m
:
i
mplement s
k
eletal
b
uiltin am
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
wrapper:
imple
m
ent xfope
n
()
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
w
r
apper: imp
l
eme
n
t xopen
(
)
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
n
o
M
erge bran
c
h 'jk/date-mo
d
e-format'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C H
a
mano
Merge branch 'p
t
/am-tests'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
M
erge
br
a
nch 'sg/bash-prompt-untracked
-
optim'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Hamano
Merge branch
'
c
b/uname-in-unt
r
a
cked'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
Merge
branch
'
se/doc-chec
k
out
-
ours
-
the
i
rs'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Merge branch 'ib/
s
cripted-parse-o
p
t-bette
r
-hi
n
t-string
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branc
h
'mh/fast-import-o
p
timize-current-from'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge branch 'kn/tag-
d
oc
-
f
ix'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge branch
'
mh/fast-import-get-mark'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Me
r
ge bran
c
h
'
gr
/
rebase
-
i-drop-war
n
'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hamano
Merge branch 'jc/commi
t
-slab'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C
H
a
m
ano
Merg
e
branch 'd
t
/log-fo
l
low-config'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge b
r
anch
'gp/sta
t
u
s-rebase-i
-
i
n
fo'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge branch 'jk/
c
at-fi
l
e-
b
a
t
c
h
-all'
commit
|
commitdiff
|
tree
2015-08-03
J
unio
C
Ha
m
ano
Me
r
g
e branch 'js
/
fsck-opt'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'mh/init-delete-r
e
fs
-
api'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
r
ge branch '
p
t/pull-bu
i
ltin
'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge branch 'jk/pkt-log
-
pack
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merg
e
branch 'm
r
/
rebase-i-custom
i
ze-insn-sh
e
et
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Hamano
M
e
rge branch '
r
l/send-
e
m
a
il-aliases'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Merge b
r
a
n
c
h '
k
b/i18n-
d
oc'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Ha
m
ano
M
e
rg
e
branch 'nd/expo
r
t-worktree'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge b
r
anch 'ee/clean-remove-dirs
'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge branch
'
c
b/parse-mag
n
itude'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
aman
o
Merge
branch 'bc/gpg-verify-raw'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
H
a
mano
Mer
g
e branch 'pt/am-foreign'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
Merge branch 'kn/for
-
each-ref
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge b
r
anch
'mh/replace
-
ref
s
'
commit
|
commitdiff
|
tree
2015-08-03
Karthik
Nayak
ref-filter
:
make 'ref_array_ite
m
' use a FLEX_ARRAY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karthik Naya
k
for-ea
c
h
-
ref: introd
u
ce fi
l
t
e
r
_
r
efs()
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-
f
i
l
ter: mo
v
e
code
f
rom 'for-each
-
ref'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Git 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
an
o
S
y
nc with
2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Junio C Haman
o
Git
2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
i
o C
H
a
m
ano
Merg
e
bran
c
h 'jk/pretty-encoding-doc' into
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C Hama
n
o
Merg
e
branch '
t
b/checkout-d
o
c' into m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
mano
M
e
rge branch
'ls/hint-rev-list-count' i
n
to maint
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Hamano
M
erge branch 'mm/b
r
anch-do
c
-up
d
a
t
es' into mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Haman
o
Merge br
a
nch 'jc/fsck-retire-requ
i
re
-
e
oh
'
into mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge br
a
n
ch '
e
t/
h
ttp-prox
y
auth' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
Merge branch
'
jc/unexport-git-pag
e
r-
i
n-u
s
e-in-
p
ager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
i
o C Ham
a
no
M
e
rge branch 'mh/strbuf-read-fil
e
-retur
n
s
-
ss
i
ze-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Mer
g
e branc
h
'kb/conf
i
g-unmap-bef
o
re
-
re
n
ami
n
g'
into
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Hamano
Merge b
r
anch '
j
k/re
v
-lis
t
-no-
b
itmap-while-p
r
uning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io C Hamano
Merge branch 'rh/test-
c
olor-avoid-t
e
rminfo-in
-
original
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Ha
m
an
o
M
e
rge branch 'jk/fix-refresh-u
t
i
me' into m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Merg
e
branch 'cb/rebase
-
am-exit-code' int
o
maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Merge branch 'jk/inde
x
-pack
-
r
educe-
r
echeck' into maint
commit
|
commitdiff
|
tree
2015-07-24
J
u
ni
o
C Hama
n
o
RelNotes
:
am
.
threeWay does not exis
t
(yet)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
Revert "git-am: a
d
d am
.
threeWay config variable"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Juni
o
C Hama
n
o
G
i
t 2
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Hamano
Merg
e
branc
h
'tf/gitweb-typofix
'
commit
|
commitdiff
|
tree
2015-07-21
Jun
i
o C
Hamano
Merge ta
g
'
l10n
-
2
.
5
.
0-rnd2
'
of g
i
t
:
//github
.
com
/
git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Jeff King
strbuf:
m
ake strbuf_addftime more robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER
Gábor
bash prompt: faster unt
r
acked status indicator
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZED
E
R Gábor
bash pr
o
m
pt: te
s
t
untracked files
s
tatus indicator
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901
:
test gi
t
-am encoding
convers
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul T
a
n
t3418: non-inte
r
active reba
s
e
-
-conti
n
ue
w
ith r
e
rere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t4150: tes
t
s for am --[
n
o-
]
scissors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4
1
5
0
: am wit
h
post-appl
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
Pau
l
T
an
t4150: a
m
with pre-applypatch ho
o
k
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
u
l Ta
n
t
4
150: am with app
l
y
patch
-
msg 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
t415
0
:
am --r
e
so
l
ved fai
l
s
if index has unmerge
d
entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
150: am --resolved fails if index has n
o
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Ta
n
t4150: am refuses patches when pa
u
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
Tan
t4151: am --abort will
k
eep dirty index intact
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4
1
50: am fails if
i
ndex is
d
i
r
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Charles B
a
iley
u
n
tra
c
ked
:
fi
x
d
e
tecti
o
n of una
m
e(
2
)
failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Junio C Ham
a
no
Merge branch 'jk/stil
l
-intere
s
t
i
ng'
commit
|
commitdiff
|
tree
2015-07-17
Junio C Ha
m
a
n
o
Merge br
a
nch 'es/worktree-add'
commit
|
commitdiff
|
tree
2015-07-17
Eric Sunshine
Documentat
i
on
/
git
:
fix stale
"
M
U
L
TIPLE C
H
ECKOUT MODE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Junio C Haman
o
wor
k
t
r
ee: caut
i
on that this is sti
l
l
expe
r
imental
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Eric Sunshine
D
ocumentation
/
git
-
work
t
ree: fix s
t
a
le "git c
h
eckout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Junio C Ham
a
n
o
Sync wi
t
h 2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
J
unio C Ham
a
no
G
i
t 2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next