repo.or.cz
/
alt-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 --rebasing mode
2015-08-05
Paul
T
an
builti
n
-a
m
: im
p
l
e
m
e
n
t
--
r
ebasing mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pau
l
Tan
builtin-
a
m: im
p
lement --
3
way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
an
c
ache-tre
e
: introduce wr
i
te_index
_
as_tr
e
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Pa
u
l T
a
n
builtin-am: im
p
lement
-
s/--s
i
gnoff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin
-
a
m
: exit with user friendly mes
s
age on failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
Tan
buil
t
in-am:
impl
e
me
n
t -q/--quiet
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
aul
T
an
builtin-am: re
j
ect patches
w
hen the
r
e's a session in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
P
a
ul Tan
b
u
iltin-am: im
p
l
ement --abo
r
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-
a
m: implement
-
-
s
kip
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul T
a
n
b
uiltin-am: don
'
t parse mail
when
r
esumi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul
T
a
n
builtin-am: implement --resolved/--con
t
inu
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Tan
builtin-a
m
:
refuse t
o
a
ppl
y
patches if index is dir
t
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
b
u
iltin-am: implement committing appli
e
d patch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-05
Paul Ta
n
builtin-am: apply patch with git-ap
p
ly
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
Tan
builtin-am:
e
xtract
patch
and commit info 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: auto-detect mbox pa
t
ches
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: spli
t
o
u
t
m
box/mail
d
ir patc
h
es 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
builtin-am: implement pa
t
c
h
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: impleme
n
t sk
e
letal
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
wrapp
e
r: implement xfop
e
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
wrapper: implem
e
nt xope
n
()
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 Ha
m
ano
Merge
b
ra
n
ch 'jk/date-mod
e
-forma
t
'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C
Hamano
Merge branch 'pt/
a
m-tests'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge branch 'sg/bash-prompt-untra
c
k
e
d-optim'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Ha
m
ano
Me
r
g
e
branch 'cb/un
a
me
-
in-untr
a
c
ked'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Merge
b
ranch
'se/d
o
c-checkout
-
o
u
r
s-theirs'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C
Hamano
Merge
b
ra
n
ch 'ib/
s
c
r
i
p
ted-
p
a
rse-o
p
t-better
-
hint-s
t
ring'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
io C Hama
n
o
Mer
g
e branch 'mh/fast-import-optimi
z
e-cur
r
ent-from'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Merge branc
h
'kn/
t
ag-do
c
-fix'
commit
|
commitdiff
|
tree
2015-08-03
J
unio C Hamano
Merge branch 'mh/fas
t
-impo
r
t-
g
e
t
-mark'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hama
n
o
M
e
rge branch 'g
r
/r
e
base-i
-
drop-warn'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Merge bran
c
h 'jc/c
o
mmit-slab'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge branch 'dt/log-
f
ollo
w
-
c
onfig'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
H
a
m
a
n
o
Merge
b
r
anch 'gp/status-rebase-i-info'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
er
g
e branch 'jk/
c
at-file-batch-all'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
Me
r
ge
branch 'js/f
s
ck-opt'
commit
|
commitdiff
|
tree
2015-08-03
Junio C H
a
m
a
no
M
e
rge branch '
m
h/init-delete-ref
s
-api'
commit
|
commitdiff
|
tree
2015-08-03
Junio C
Ha
m
ano
M
erge branch
'
pt/pull-built
i
n'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
M
e
rge branch
'
jk/pk
t
-log-pack
'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hamano
M
e
rge branc
h
'mr/rebase-i-custo
m
i
z
e
-i
n
sn-shee
t
'
commit
|
commitdiff
|
tree
2015-08-03
J
u
n
io C Hamano
Merge branch 'rl
/
sen
d
-emai
l
-
a
l
iases'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C Ham
a
no
Merge branch 'kb/
i
18n-doc'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Ham
a
no
Merge branch 'nd/export-work
t
r
ee'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Merge br
a
nch 'ee/clean-remove-dirs'
commit
|
commitdiff
|
tree
2015-08-03
Junio
C
Hama
n
o
Mer
g
e
b
ranch 'cb/
p
arse-magnitude'
commit
|
commitdiff
|
tree
2015-08-03
Jun
i
o C Hamano
Merge
branch 'bc/gp
g
-verify
-
r
a
w'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Hama
n
o
M
e
r
g
e b
r
anch 'pt/
a
m-foreign'
commit
|
commitdiff
|
tree
2015-08-03
Juni
o
C Hamano
Mer
g
e branch 'kn/
f
o
r-each-ref'
commit
|
commitdiff
|
tree
2015-08-03
Junio C Haman
o
Me
r
ge br
a
nc
h
'mh
/
replace-refs'
commit
|
commitdiff
|
tree
2015-08-03
Karthik N
a
yak
ref-filter:
m
ake 'ref
_
arr
a
y_item'
use a FLEX_ARRAY
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
K
arthik Nayak
for-
e
ach-ref: i
n
trodu
c
e f
i
lter_refs()
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-08-03
K
a
rthik Nayak
r
ef-f
i
lter: move code from 'for-each-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
Junio C Haman
o
Sync wi
t
h 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 Hamano
M
e
rg
e
branch 'jk/pretty-en
c
od
i
ng-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o
C Hamano
Me
r
ge branch 'tb/checkout-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
J
unio C
Hamano
M
er
g
e branch 'l
s
/hint-rev-list-count' into
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
io
C
Hamano
Mer
g
e branch 'm
m
/br
a
nc
h
-do
c
-up
d
ates' into mai
n
t
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
M
e
rge branch 'jc/fs
c
k-retire-require-eoh'
into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge
bran
c
h 'e
t
/http
-
pr
o
xya
u
th' int
o
maint
commit
|
commitdiff
|
tree
2015-07-27
Ju
n
i
o
C Hamano
Merge branch 'jc/
u
nex
p
o
r
t-git-pager-in-use-in-p
a
ger
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Haman
o
Me
r
g
e
branch '
m
h/strbuf-read-file-re
t
urns-ssize-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Hamano
M
e
r
g
e
b
ranch 'kb/config-unmap-
b
efore-
r
enaming' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Merge
b
ranch 'jk/re
v
-list-no-bitm
a
p-while-pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hamano
Merge branch 'rh/test-color-avoi
d
-terminfo-in-original
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Me
r
ge bra
n
ch 'jk/
f
ix-refresh-utime' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C Hamano
Merge br
a
n
c
h 'cb/rebase-am
-
exi
t
-
c
o
de'
i
nto maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C H
a
mano
Merge br
a
nch
'
jk/index-pac
k
-r
e
duce-rec
h
eck
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-07-24
Jun
i
o C Hamano
RelNotes: am
.
th
r
ee
W
ay
d
o
e
s
not exist (y
e
t)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
Revert "gi
t
-am: add
a
m
.
th
r
eeWay config variable"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Ham
a
no
Git 2
.
5
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-21
Ju
n
i
o C Haman
o
Merge bra
n
c
h 'tf/gitweb
-
typofix'
commit
|
commitdiff
|
tree
2015-07-21
Junio C Hama
n
o
Merge
t
ag 'l10n-2
.
5
.
0-rnd2' of git:/
/
githu
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-21
Jeff
King
strbuf:
m
ake strbuf
_
a
d
dftime more
r
o
bust
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
SZEDER Gábor
bash pr
o
mpt: faster
untracked status indicator with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
S
Z
E
D
ER Gábor
bash promp
t
: test untracked fil
e
s
status indicator
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l
Tan
t3901: te
s
t git-am encodin
g
c
o
nversio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul T
a
n
t3418: non-in
t
erac
t
ive rebase
-
-continue with rerere
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pa
u
l Tan
t4150:
test
s
for
am --[no-]scisso
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am with post
-
a
p
pl
y
p
atch 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
a
ul Tan
t4150: am
w
ith pre-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
t4
1
50: am with applypatch-
m
sg 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
41
5
0
: am --resolved fails if
i
nde
x
has unm
e
r
g
ed entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul
T
an
t4
1
5
0: am --resolved fail
s
if i
n
de
x
has no changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Pau
l
Tan
t
4
1
5
0
: am
r
efuses patches when paus
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
P
aul
T
an
t4151: am --a
b
o
r
t will keep dirty
i
ndex intact
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-20
Paul Tan
t4150: am
f
ails
i
f index i
s
d
i
rty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-17
Charles Bailey
unt
r
acked:
f
i
x detection o
f
una
m
e(
2
)
failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-17
Junio
C Ha
m
ano
Merge
b
ranch 'jk/still-int
e
rest
i
ng'
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hamano
Merge branch 'es/worktree-add'
commit
|
commitdiff
|
tree
2015-07-17
Eric
S
unshine
Documentation/gi
t
:
f
ix stale
"MULTIPLE C
H
ECKOUT MO
D
E
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-16
Juni
o
C
H
a
m
a
no
worktree: caution that th
i
s is s
t
ill exper
i
me
n
t
al
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-16
Eric Sun
s
h
in
e
Doc
u
m
e
ntation
/
git-worktree: fix
stal
e
"git checkout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Sy
n
c wit
h
2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
J
u
n
io C Ha
m
ano
Git 2
.
4
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
M
e
rge b
r
anc
h
'
j
c/diff-ws-error-highli
g
ht
'
commit
|
commitdiff
|
tree
2015-07-15
J
u
nio C Hama
n
o
Me
r
ge branch 'mm/describe
-
do
c
' i
n
to main
t
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
io C Hamano
Merge
b
ranch 'jc
/
p
rompt-docum
e
nt-ps1-
s
t
a
te-separa
t
or
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge
b
ran
c
h
'es
/
osx-h
e
ader
-
po
l
lu
t
es-mask-
m
acro' into
.
.
.
commit
|
commitdiff
|
tree
next