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: handle stray state directory
2015-08-05
Paul Tan
builtin-am: han
d
le stray state directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
builtin-
a
m: bypas
s
g
i
t-mailinfo when --rebasin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
builtin-am: implement --rebasing mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
built
i
n-am: imp
l
e
m
e
n
t
--3way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul T
a
n
c
a
ch
e
-
t
r
ee: intro
d
uce
write
_
i
ndex_as
_
t
r
ee()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
b
uiltin-am:
i
m
p
lement -s/
-
-si
g
noff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am: ex
i
t wit
h
user friendly messag
e
o
n
failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
bui
l
tin-am
:
i
mple
m
ent -q/--quiet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
b
uilt
i
n-a
m
: re
j
ect pat
c
hes
when ther
e
's a session in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
built
i
n-am: implement --abort
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 --skip
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l Tan
bu
i
ltin-am: don't
pars
e
mail when resumi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
builtin-am
:
i
m
p
lement --resolved
/
-
-
continue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
builtin-am: refu
s
e to ap
p
ly patches if in
d
e
x
is di
r
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
bui
l
tin-am: implement committing app
l
i
ed
p
a
tch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-05
P
aul Tan
buil
t
i
n-am: ap
p
ly patch with
git-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
builtin-am: extract pa
t
c
h
and commit 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
P
a
ul
Tan
builtin-am: auto-detec
t
m
box 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-am
:
split
out
m
box/maildir patche
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
Pa
u
l Tan
builtin-am:
implemen
t
patch qu
e
ue
m
e
c
han
i
sm
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
-
a
m: implement skeleta
l
bu
i
ltin
am
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
wrapper: imp
l
eme
n
t
xfopen()
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
wrappe
r
:
im
p
lement xo
p
en()
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
Merge bra
n
c
h 'jk/d
a
te-mode-f
o
rmat'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge bran
c
h 'pt/am-tests'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Merge branch 'sg/bash-prompt-untracke
d
-optim'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Merge br
a
n
ch 'cb/uname-in-untracked'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge br
a
nc
h
'se/doc-che
c
kout-ours-the
i
rs'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
n
o
Me
r
ge bra
n
ch 'ib/scripted-par
s
e
-
o
p
t
-
bet
t
er-hint-st
r
ing
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
Merge branch
'
mh/fa
s
t-import-opti
m
ize-current-from
'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Merge branch 'kn/tag-doc-fix'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
aman
o
Merge
b
ranch 'mh/fast-import-get-mark'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio
C
Ha
m
ano
M
erge branch
'
gr/rebase-i-d
r
op-warn'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
M
e
rge branch 'jc/commit-s
l
ab'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge branch 'dt/l
o
g-f
o
ll
o
w-config'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
rge
branch 'gp/stat
u
s-rebase-i-info'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'jk/cat-file-bat
c
h-all'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
Merg
e
b
r
a
n
ch
'
j
s
/
fsck-opt'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o
C Hamano
Merge branch 'mh/init-delete-ref
s
-
a
pi'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'pt/p
u
ll
-
builtin'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge branch 'jk/pkt-log-
p
ack'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Hamano
Mer
g
e b
r
an
c
h 'm
r
/r
e
base-i-custo
m
ize
-
insn-she
e
t
'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Ha
m
ano
Merge branch 'r
l
/send-ema
i
l-a
l
i
a
s
e
s'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
Merge b
r
anch 'kb/
i
18n-doc'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Merge branch '
n
d/
e
xport
-
wo
r
ktree
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge b
r
anch '
e
e/clean-remove-dirs'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch
'cb/pars
e
-magnitude'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hamano
Merg
e
br
a
nch 'bc/gpg-verify-raw'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ham
a
no
Merge branch
'
p
t/am
-
foreign'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Merg
e
br
a
nch
'
kn/for-each-ref'
commit
|
commitdiff
|
tree
2015-08-03
J
u
nio C Hamano
M
e
rg
e
branch 'mh/replace-refs'
commit
|
commitdiff
|
tree
2015-08-03
Kart
h
ik Nayak
r
e
f-filter: make 'ref_array_item'
u
se a
FLEX_A
R
RAY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-03
Karthik Na
y
ak
for-
e
a
c
h-ref:
i
nt
r
oduce
f
ilter_
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
K
art
h
ik Naya
k
ref
-
fil
t
er: move code from 'fo
r
-each-r
e
f'
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
Junio C Hamano
Sync
w
i
th 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 br
a
nch 'jk/pretty-en
c
oding-
d
oc'
into m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
M
e
rge branch 'tb/checkout-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Mer
g
e bran
c
h 'ls/hint-rev-list-coun
t
' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hamano
Merge b
r
anc
h
'
m
m/branch
-
doc-upd
a
tes' into
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
mano
Merge
b
ranch 'jc
/
fsck-
r
e
t
ir
e
-requi
r
e
-
eoh' into mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
amano
Merge branch 'et
/
http
-
proxyauth' into mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge br
a
nc
h
'jc
/
un
e
xport-git-pager-in-us
e
-in-pa
g
er
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Ha
m
ano
M
erge branch '
m
h/strbu
f
-r
e
ad-
f
ile-re
t
urns
-
ss
i
ze-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
mano
Merg
e
b
ranch 'kb/con
f
ig-unmap
-
be
f
ore-renaming' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Merge branch
'
j
k
/
rev-li
s
t-no-bitmap-while-pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
e
rge branch 'rh/test-color-avoid
-
ter
m
info-
i
n-original
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hama
n
o
Merge
b
r
anch 'jk/fix-refresh-
u
time' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge branch 'cb/reba
s
e-
a
m-
e
xi
t
-
code' into main
t
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Merge
b
ranch 'jk/index-pack-red
u
ce-recheck' in
t
o maint
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Hamano
RelNotes: a
m
.
t
hreeWay doe
s
no
t
exist (y
e
t)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Ju
n
io C Hamano
Revert
"
git-am: a
d
d am
.
th
r
eeWay confi
g
variable"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Haman
o
Git 2
.
5
.
0
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Ju
n
io
C
Haman
o
Merge branch '
t
f/gitweb-
t
y
pofix'
commit
|
commitdiff
|
tree
2015-07-21
Junio C
H
ama
n
o
M
e
r
ge tag 'l10n-2
.
5
.
0
-
rnd
2
' of git:
/
/github
.
c
o
m
/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
J
eff K
i
ng
strbuf: make strbuf_addftime more robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
SZ
E
DER Gábor
bash
p
r
o
m
pt:
faster untrack
e
d status indicator with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
S
Z
EDER Gábo
r
bash prompt: test unt
r
acked files status indicator
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t3901:
t
est git-am
e
ncoding conve
r
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Ta
n
t3418:
non-inte
r
active re
b
ase
-
-continue w
i
th rerere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t41
5
0: tests for am --[no
-
]sciss
o
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t
4150
:
am wi
t
h post
-
applypatch 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
t
4
150: am
with pre
-
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
Paul Tan
t415
0
: am with
applyp
a
tch-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:
a
m --re
s
olved fa
i
ls if index has unme
r
ge
d
e
n
t
ri
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t4150: am
-
-re
s
o
lved fails if ind
e
x has no chan
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am refuses patches wh
e
n paused
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4151: am --abort wi
l
l ke
e
p dirty index intac
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-20
Paul
Tan
t415
0
: am fails if index is dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Cha
r
l
e
s
B
ailey
unt
r
acked: fix dete
c
tion of un
a
me(2) failu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hamano
Me
r
ge branch 'jk/sti
l
l-
i
n
teresting'
commit
|
commitdiff
|
tree
2015-07-17
J
unio C Hamano
Me
r
ge br
a
nch 'es/workt
r
ee-add
'
commit
|
commitdiff
|
tree
2015-07-17
Eric S
u
nshin
e
Documentation
/
g
i
t: fix
s
tale
"
MULTIPLE
CHECK
O
UT MOD
E
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Juni
o
C Hamano
w
o
rktree
:
caution that this
i
s
stil
l
experimen
t
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
E
ric Sunshi
n
e
Do
c
umentation/git-worktree:
fix stale "git
c
he
c
kout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Junio C
Hamano
Sync with 2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Git 2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C Hamano
M
e
rge bran
c
h 'jc/diff-
w
s-error-highl
i
g
ht'
commit
|
commitdiff
|
tree
2015-07-15
J
unio C Hamano
Merge branch
'mm/descri
b
e
-
d
oc'
into
m
ai
n
t
commit
|
commitdiff
|
tree
next