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
builtin-am: handle stray state directory
2015-08-05
Paul Tan
builtin-am:
h
a
ndle stray
st
a
te d
i
rectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin
-
am:
b
ypass git-mailinfo when --reba
s
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
T
a
n
builtin-am: implemen
t
--re
b
asing mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uil
t
in-am: impleme
n
t --3way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
c
a
c
h
e-tree: introduce write_i
n
d
e
x
_a
s
_
t
r
ee()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
bu
i
ltin-am: implem
e
nt -
s
/--signoff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-
a
m
:
exit with
u
ser friendly message o
n
failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-
a
m: imp
l
ement -q
/
--quiet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
built
i
n-am: rejec
t
patches when there
'
s a session
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bu
i
ltin-am: impleme
n
t --abort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Ta
n
builtin-am: impleme
n
t --skip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
bui
l
ti
n
-am: don't parse
mail when resu
m
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uil
t
in-am:
i
mplement --resolve
d
/
--con
t
inue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
u
il
t
i
n-am: refuse to apply
p
atches if
i
n
d
ex is d
i
r
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
bui
l
t
i
n-am: implement c
o
mmitting applied patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builti
n
-am: a
p
ply pa
t
ch w
i
th git
-
app
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
uiltin-am
:
extrac
t
patch and commit
i
nfo 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
b
u
i
ltin-am
:
auto-detect mbox
p
atches
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: split out m
b
ox/maildir patches 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
buil
t
in
-
am: implement p
a
tch 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
P
a
ul Tan
builtin
-
am: implement skeleta
l
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 Tan
wrapper:
i
mplement 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 Hamano
M
e
rge branch 'jk/dat
e
-mode-f
o
rmat'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Haman
o
Merge b
r
anc
h
'p
t
/am
-
tests'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Haman
o
Me
r
ge bra
n
ch
'
sg/ba
s
h-prompt-u
n
tracke
d
-optim
'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Ha
m
ano
Me
r
ge bra
n
ch 'cb
/
un
a
me-in-untracked'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio
C Ha
m
ano
Merge branch 's
e
/doc-che
c
kout-ours-their
s
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
ano
M
e
rge branch 'ib/scripted-par
s
e-opt-bet
t
e
r-hint-string'
commit
|
commitdiff
|
tree
2015-08-03
Ju
n
i
o
C H
a
mano
Merge br
a
nch 'mh/fast-impor
t
-opti
m
i
z
e-c
u
rrent-fr
o
m'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge bra
n
ch 'kn/tag-d
o
c-fix
'
commit
|
commitdiff
|
tree
2015-08-03
J
unio
C Hamano
Merge bra
n
c
h
'mh/fas
t
-import-get-mark'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
M
e
r
g
e branch 'gr/re
b
ase-i
-
drop-warn'
commit
|
commitdiff
|
tree
2015-08-03
J
un
i
o C Ha
m
ano
Merge
b
ranch
'jc/commi
t
-slab'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
a
m
ano
Merge b
r
anch 'd
t
/
log
-
follow-c
o
nfig
'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C H
a
m
a
n
o
Merge branc
h
'gp/
s
tatus-reb
a
se-i-info'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
mano
Merge bra
n
ch 'j
k
/cat-file-batc
h
-all'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Ham
a
n
o
Merge branch 'js/fsck-opt'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'mh/init-delete-refs-api'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Hamano
Merge branch 'pt
/
p
u
ll
-
builtin'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Merge br
a
nch 'j
k
/pk
t
-l
o
g-pack'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge b
r
anc
h
'mr/rebase-
i
-
c
u
stomize-insn-sheet'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
M
e
rge br
a
nch 'rl
/
s
e
nd-em
a
il-alias
e
s'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge b
r
anch '
k
b/i18n-doc'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge bra
n
ch 'nd/export-worktr
e
e'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hama
n
o
Merge bra
n
ch 'ee/cle
a
n-remove-
d
irs
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merg
e
branch 'cb/parse
-
m
agn
i
tude'
commit
|
commitdiff
|
tree
2015-08-03
J
un
i
o C Ha
m
a
no
Merge branch '
b
c
/gpg-verify-raw'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C
H
am
a
n
o
Merge branch 'pt/am-foreign'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Ham
a
no
Merg
e
branch
'
k
n
/for-ea
c
h-ref
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branc
h
'm
h
/
replace-refs'
commit
|
commitdiff
|
tree
2015-08-03
K
art
h
ik Nayak
ref
-
filter:
m
a
ke 'ref
_
array_item' use a F
L
EX_ARRAY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karthi
k
Nayak
for-each-ref: introduce fi
l
t
e
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
Ka
r
thik
N
ayak
ref-filter:
m
o
v
e
code
f
r
o
m
'for-eac
h
-ref'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio
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
Git 2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Merge bra
n
ch 'jk/pretty-encoding
-
doc'
i
n
to
main
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Merg
e
b
ra
n
ch 'tb/checkout-doc' i
n
to maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hama
n
o
Merge branch 'ls/hint
-
rev-list-co
u
nt' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
ano
Me
r
ge branch 'mm/branch-
d
oc-updates' into maint
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Ha
m
a
n
o
Me
r
ge
branc
h
'jc/fsck-retire-require-
e
o
h
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merg
e
b
ranch 'et/http-prox
y
a
u
th' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
Merge bra
n
ch '
j
c/unexport-git-pager-in-us
e
-i
n
-pa
g
er
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
an
o
Merge bran
c
h
'mh/
s
trbuf-read-fil
e
-
r
eturns-ssize-
t
'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
i
o
C Hama
n
o
Merge branch 'kb/config-unmap
-
b
e
f
o
r
e-rena
m
ing' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Ha
m
ano
Merge b
r
anch 'jk/rev-list-no
-
bit
m
a
p-w
h
ile-pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hamano
Merge
branch
'rh/test-color-avoid-terminf
o
-in-original
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
m
a
no
M
e
r
ge branch
'
j
k
/fix-refres
h
-u
t
i
m
e
' into maint
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Ham
a
no
Me
r
ge branch 'cb/rebase-am-exit-code
'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Merge br
a
nch 'jk/inde
x
-
p
a
c
k
-reduce-rech
e
c
k'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Hamano
RelNo
t
es: am
.
threeWay does not exist (yet)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
Re
v
ert "
g
it-
a
m:
add
am
.
three
W
ay config variable
"
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
Hama
n
o
Merge bran
c
h 'tf/gitwe
b
-typofix'
commit
|
commitdiff
|
tree
2015-07-21
J
u
n
io C Hamano
Merge tag 'l10n-2
.
5
.
0-r
n
d2' of git://github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Je
f
f King
str
b
uf: ma
k
e strbuf_ad
d
f
tim
e
more rob
u
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER Gá
b
or
bash p
r
ompt: fast
e
r untrac
k
e
d status indi
c
a
t
or w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZEDE
R
Gá
b
or
bash
p
rompt: test untracked files status indicato
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901: test g
i
t-am encoding conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Ta
n
t
3
418:
n
on-interac
t
ive rebase --continue with
r
erere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: te
s
ts
f
or am --[n
o
-]scissors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
a
n
t4150: am
w
ith post-appl
y
p
a
t
c
h 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
ul Tan
t
4
1
5
0
:
a
m
with p
r
e
-app
l
ypatch hook
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
aul Ta
n
t4150: am with a
p
p
lypatch-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
P
aul Tan
t4150:
a
m --res
o
lved fails if index has unmerge
d
entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t4150:
a
m
--res
o
lv
e
d fai
l
s if index
h
a
s
no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am refuses patches when paused
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
P
a
ul Tan
t415
1
: am --abort wil
l
keep dirty index in
t
a
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l T
a
n
t4150
:
am
fails
if inde
x
is
dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Charl
e
s Bailey
untracked: fix det
e
ction of uname(2) failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Junio C H
a
mano
Me
r
ge bra
n
ch 'jk/
s
till-interestin
g
'
commit
|
commitdiff
|
tree
2015-07-17
Junio C H
a
mano
Merge
branch '
e
s/
w
orktr
e
e-add'
commit
|
commitdiff
|
tree
2015-07-17
Eric Sunshine
Do
c
u
mentati
o
n/gi
t
: fix stale
"
M
ULT
I
PLE CH
E
CKOUT MO
D
E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Junio
C
Hamano
work
t
ree: caution t
h
a
t th
i
s is sti
l
l experi
m
e
nt
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Eric Sun
s
hine
Docum
e
ntation/
g
it-worktree: fix sta
l
e "gi
t
c
h
eckout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Juni
o
C Haman
o
Sync with
2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
G
it 2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
Hamano
M
e
rge branch 'jc
/
d
i
f
f-
w
s-err
o
r-highlight'
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
io C Ham
a
no
Merge
b
ranch 'mm/describe-doc' into m
a
int
commit
|
commitdiff
|
tree
next