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
am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
2015-08-19
Paul Tan
a
m
--skip/--abort: merge HE
A
D/
O
R
I
G
_
HEA
D
t
r
e
e
i
n
to
i
ndex
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Remi
L
es
p
inet
git
-
am:
a
dd am
.
threeWay config vari
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: remove r
e
direction
to
git
-
am
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
bu
i
ltin
-
am: check for valid co
m
mi
t
ter ident
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
buil
t
in-am: implement leg
a
cy -b/--bina
r
y option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
au
l
Tan
builtin-am: im
p
lement
-
i/--
i
n
t
eractive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
: su
p
port
a
nd auto-detect
m
ercurial patches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am
:
support an
d
a
u
t
o
-
d
et
e
ct StGit ser
i
es files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
buil
t
in
-
am: supp
o
r
t and auto-de
t
ect
StG
i
t p
a
tches
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
l
tin-
a
m
: rerere support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: i
n
voke
p
ost-
a
ppl
y
patch hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: invo
k
e pre-applypatch
h
ook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: inv
o
ke applypatch-m
s
g hoo
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am
:
sup
p
ort automat
i
c
n
o
tes cop
y
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
buil
t
in-am: invoke p
o
st-rewr
i
te hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: i
m
plemen
t
-S/--gpg-sig
n
, commit
.
gpgsign
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bui
l
tin-am:
i
m
p
lemen
t
-
-c
o
mmitter-date
-
is-author-date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: imp
l
ement --ignore-date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
b
u
i
l
tin-am: pass gi
t
-
a
pply's options to git-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am
:
implement -
-
[no
-
]s
c
issor
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am
:
support --keep-cr, am
.
k
eep
c
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l
Tan
builtin-
a
m: impl
e
ment --[
n
o-]message
-
id
,
am
.
m
e
ssag
e
id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement -k/--keep, --keep-non-patch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement
-u/--ut
f
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
builtin-am: handle stra
y
state directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: bypass g
i
t-mailinf
o
when --re
b
asin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am: impl
e
ment --reba
s
ing m
o
de
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-
am: implemen
t
--3way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
c
a
che
-
tr
e
e: intro
d
uce write_index_as_tree()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builti
n
-am: implement -s/
-
-signoff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: exit with user
f
riendly
message on failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
tin-am: i
m
plem
e
n
t
-
q/--qui
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-
a
m
:
rejec
t
patc
h
es when
t
here's a
sessio
n
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-am: implemen
t
--abort
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
builtin-
a
m: implement -
-
ski
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
bu
i
ltin-am: don
'
t parse mai
l
when
r
esuming
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: impl
e
ment --res
o
lved/--con
t
inu
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
an
bu
i
ltin-am
:
refuse to appl
y
patc
h
es if index is dirty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-am: implement
committi
n
g applied
p
atch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
ilti
n
-am:
apply patch w
i
th
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
Paul Tan
builti
n
-am: extract patch and c
o
m
m
it in
f
o 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
T
an
builtin-am:
a
uto-
d
e
tect
mbox patch
e
s
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: split out mbox/
m
aildi
r
p
a
t
ches
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
Pa
u
l Tan
builtin-
a
m
: impl
e
men
t
p
atch queue
m
echa
n
i
s
m
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
builtin-am:
i
mp
l
ement s
k
eletal builtin a
m
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
wrapper: impleme
n
t xf
o
pen()
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
wr
a
pper: implemen
t
x
o
pen()
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C
H
amano
Merge branch 'jk/date-
m
ode-form
a
t'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Merge
b
ranch
'pt/am-t
e
sts'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hama
n
o
Merge branch
's
g
/ba
s
h-prom
p
t
-
un
t
r
a
c
k
e
d-optim'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
M
e
rge branch
'cb/uname-in-
u
ntracke
d
'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hamano
Merge
b
ranc
h
'se/doc-checkout
-
ours-th
e
irs'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Haman
o
Me
r
ge bran
c
h 'ib/scr
i
p
ted
-
pars
e
-
o
pt-bet
t
er-hint-string'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C H
a
man
o
Merge branch 'mh/f
a
st-impo
r
t-optimize
-
current-
f
rom'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
M
erge
b
ran
c
h 'kn/t
a
g
-
d
oc-fix
'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
Merg
e
branch 'mh/fast-impor
t
-
g
et-ma
r
k'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
amano
M
erge branch 'gr/reba
s
e-i-drop-war
n
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
Merge branch 'jc/commit-sla
b
'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C
Hamano
Merge branch 'dt/log-follow-config
'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Mer
g
e
b
ranch 'gp/
s
tatus-r
e
bas
e
-i-info
'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Mer
g
e branch 'jk/ca
t
-file-batch-
a
l
l'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Mer
g
e
b
ranch
'
js/fsck-opt'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
Merge b
r
anc
h
'm
h
/
i
n
it-delete-refs-api'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Merge branch 'pt/pull-builtin'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
Merge
b
ran
c
h 'jk/p
k
t-log-p
a
ck'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
io C Hamano
M
er
g
e bra
n
c
h 'mr/rebase-i
-
customize-in
s
n
-
s
h
eet'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Ham
a
no
Merg
e
branch 'rl/send-email-aliases'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
ano
Merge br
a
nch '
k
b/i18n-doc'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
m
a
no
Merge
b
ranch '
n
d/ex
p
ort
-
worktree'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
M
e
r
ge branch 'ee/c
l
e
a
n-remov
e
-dirs'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Haman
o
Me
r
ge b
r
anch 'cb/parse-magn
i
tude
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
rge branch 'bc/gpg-verify-raw'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
ano
Merge bra
n
ch '
p
t/am-f
o
reign'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Ha
m
ano
Merge b
r
anch 'kn/for-e
a
ch-ref'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
Merg
e
b
r
a
nc
h
'mh
/
replace-re
f
s
'
commit
|
commitdiff
|
tree
2015-08-03
Ka
r
thik Nayak
ref-filter
:
m
a
k
e
'ref_array_item' use a
F
LEX_ARRAY
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
Karth
i
k Nayak
for-each-ref: introduce filter_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-fil
t
er: move co
d
e from 'for-eac
h
-ref'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
Git 2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Sync with 2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Git 2
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
mano
Merg
e
branch
'jk/pret
t
y-enc
o
d
i
ng-doc' i
n
to main
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
M
e
rge branch
'tb/c
h
eckout-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
Me
r
ge br
a
nch
'ls/hin
t
-rev-list-c
o
u
nt' i
n
to maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch 'mm/branch-doc-u
p
dates' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch 'jc/fsck-retire-require-
e
oh'
i
nto maint
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
i
o C
H
a
mano
Mer
g
e b
r
anch 'e
t
/ht
t
p-proxyauth' into
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge bran
c
h
'jc/unexport-git-p
a
ger-in-use-in-pa
g
er
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hama
n
o
Merge
branch 'mh/strbuf
-
read-file-returns
-
ssize-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hama
n
o
Merge
branch 'kb/config-unmap-
b
e
fo
r
e-r
e
naming' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Ha
m
ano
M
e
rge branch 'jk/rev-list-no-
b
i
tmap-w
h
ile-pru
n
ing'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge b
r
an
c
h 'rh/test-color-avoid-ter
m
in
f
o
-
in-original
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Haman
o
Merge branch
'jk/fix-refresh-utime' int
o
maint
commit
|
commitdiff
|
tree
2015-07-27
J
u
n
io
C
Ha
m
ano
Merge bran
c
h 'cb/r
e
base
-
am-exit-code'
into
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hama
n
o
Me
r
ge branch 'jk/
i
ndex-pa
c
k
-
red
u
ce
-
r
e
c
heck' into ma
i
nt
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
R
e
lNotes
:
am
.
t
h
reeW
a
y does not exist (y
e
t)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C Hamano
Rever
t
"git
-
a
m: add am
.
three
W
ay config varia
b
le"
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
Hamano
Mer
g
e b
r
anch 't
f
/gitwe
b
-
t
ypof
i
x'
commit
|
commitdiff
|
tree
2015-07-21
Ju
n
io C Hamano
Merge t
a
g
'l10n-2
.
5
.
0
-rnd
2
' of git://git
h
ub
.
co
m
/git
.
.
.
commit
|
commitdiff
|
tree
next