repo.or.cz
/
stgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Only check for upstream merges if not fast-forwarding
2006-06-11
Catalin Marina
s
Sh
o
w
t
he
s
td
e
rr
f
o
r failed GIT com
m
a
n
ds
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-06-11
Catalin M
a
r
inas
Fix the t1
2
01-pull-tra
i
ling
.
sh
tes
t
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-06-06
C
a
talin Mari
n
as
Ad
d
t
h
e --re
p
l
a
ce option to import
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-05-25
Catalin Marinas
I
m
plement the 'got
o
' comm
a
nd
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-05-24
Catalin Marinas
Add the --update option to
pick
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-05-09
Catali
n
Marin
a
s
Allow confi
g
urable file ext
e
nsi
o
ns for mer
g
e con
f
licts
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-05-08
Cata
l
in Marinas
Fix git
.
r
eset()
to remove th
e
add
e
d files
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-05-03
Cat
a
lin Ma
r
inas
Fix the added
t
o
bot
h
but differe
n
t conflict
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-05-03
Catalin
M
a
r
i
n
as
Allow git
.
chec
k
o
u
t() to
w
ork on un
m
erged indexes
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-04-07
Catalin Marinas
Release 0
.
9
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-04-06
Catali
n
M
arinas
Use 'git-*'
i
nstead of
'
g
it *'
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-31
Catali
n
M
a
rin
a
s
Use
a pager for diff
and show commands
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-31
Catalin Marina
s
Re
m
o
ve the base
d
ir exce
p
tio
n
throwing
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-31
Catalin Marinas
Add a 'show' command
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-31
Catalin M
a
rinas
Add the '--undo' option
t
o 'r
e
fresh
'
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-28
Ca
t
alin M
a
rinas
Add ex
t
r
a
he
a
ders to
th
e
e-mail mes
s
ag
e
s
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-28
Cat
a
lin
Marinas
Remo
v
e the check
i
ng for the default configur
a
tion values
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-28
Catalin
Mari
n
as
Create stgit/b
a
sedir
.
py for d
e
termining the
.
git
directo
r
y
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-28
Catalin Marinas
Add the "smtpde
l
ay"
c
onfig optio
n
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-28
Catalin M
a
rinas
The
gitmerg
e
onefile
co
n
fig sec
t
ion
is
d
ep
r
e
c
ate
d
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-28
Cat
a
lin Marinas
Update the TODO fil
e
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-25
Catalin Marinas
Fix the pat
c
h name
s
t
r
ipping i
n
import
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-16
C
a
tali
n
Mar
i
nas
A
d
d
the --strip
opt
i
on to im
p
ort
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-16
Catal
i
n
Marin
a
s
Add th
e
--patch o
p
tion t
o
e
xport
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-10
C
atalin Marinas
Deal
with merge conflic
t
s directly
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-09
C
a
tali
n
Marinas
gitmergeonef
i
le
.
p
y
s
h
o
ul
d
u
s
e
git
.
get_base_di
r
(
)
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-09
Ca
t
a
l
in M
a
rinas
Pass the --a
g
gre
s
sive flag to git-read-tree
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-09
Catalin Marin
a
s
Cache t
h
e base
_
d
i
r value for sub
s
e
q
uent c
a
lls
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-03
C
a
talin
M
arinas
Add -
-
series to import
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-03
C
a
ta
l
i
n Marinas
Add a me
r
g
e
d
upstre
a
m test
f
or
pull and p
u
sh
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-01
Catalin M
a
rina
s
Print a sho
r
t
er u
s
ag
e
mess
a
ge with the --help o
p
tion
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-03-01
Catalin Marinas
A
llow stg to be loaded in pydb and not run main(
)
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-02-28
Catalin Marinas
F
ix
t
he r
e
s
e
t command
to s
e
t HEAD to a proper
id
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-02-20
Catalin Marinas
Fix
t
he e
-
m
a
il addres
s
escaping
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-02-17
Catalin Marinas
Add --m
b
ox op
t
ion to the 'mail' command
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-02-17
Catalin Marina
s
Add --std
o
ut option to export
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-02-17
Ca
t
al
i
n Marinas
A
llow tag objects t
o
b
e
p
asse
d
on the c
o
m
m
an
d
line
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-02-13
Cat
a
lin
Marinas
A
d
d prune-sa
f
ety to StGIT
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-02-05
Catalin
M
ar
i
nas
Check w
h
e
t
he
r
the file
ex
i
sts in the fol
d
command
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-02-05
Catalin Marinas
U
s
e the GIT-
s
pecif
i
c environment as de
f
ault
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-01-23
Ca
t
a
lin Marinas
Al
l
ow patch r
e
freshing fo
r
som
e
files only
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-01-23
Catalin Marinas
Merge
b
ra
n
ch 'ma
s
t
er' o
f
http://h
o
mepage
.
ntlworld
.
com
.
.
.
commit
|
commitdiff
|
tree
2006-01-22
Catali
n
Marina
s
R
emove the --force option f
o
r
new
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-01-21
Catal
i
n
M
arin
a
s
F
ix the 's
t
atus --reset' for
i
ndividual fil
e
s
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-01-13
Catalin Marinas
Merge branc
h
'
m
aster' of h
t
tp://h
o
m
epage
.
n
t
l
w
orld
.
c
o
m
.
.
.
commit
|
commitdiff
|
tree
2006-01-12
Catalin Marina
s
Fix
the clone
c
om
m
and fa
i
lure
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2006-01-07
Catalin Marinas
M
erg
e
branch
'm
a
st
e
r' of
http://ho
m
epage
.
ntlwo
r
ld
.
com
.
.
.
commit
|
commitdiff
|
tree
2005-12-23
C
a
talin
M
arin
a
s
Merge
br
a
nch 'master
'
of h
t
t
p://
h
omepage
.
ntlworld
.
com
.
.
.
commit
|
commitdiff
|
tree
2005-12-23
C
a
t
al
i
n Ma
r
in
a
s
Release 0
.
8
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-12-23
Ca
t
alin Marina
s
"status --
r
eset" does not restore the deleted
files
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-12-22
Catalin
Marinas
X-G
m
ai
l
-Received: cccb
b
3cd
c
84a
e
4
31fe0735
6
861cbfa18540eab00
From:
Catalin Marinas
<catalin.marinas@arm.com>
From:
Catalin Marinas
<catalin.marinas@gmail.com>
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-12-21
Cat
a
li
n
Marinas
Fix the import command when the bo
d
y is empt
y
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-12-16
Catalin Marinas
Update the TODO
information
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-12-16
C
a
t
ali
n
Mar
i
na
s
Update
the t
u
torial
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-12-11
Catalin Marinas
Make StGIT comply with the author
i
n
formation retrievin
g
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-11-18
Ca
t
alin Marinas
Allow '
s
t
g
stat
u
s --reset' to work on indi
v
idual files
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-11-18
C
atalin Marinas
Fix
the u
n
app
l
ied
v
ariable missing in expo
r
t
.
py
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-11-11
Catalin Mar
i
nas
Fix the --na
m
e option for the pick co
m
mand
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-11-10
Catali
n
Marinas
Op
t
imise pick --fold to use git-
a
pply first
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-11-09
Catalin
M
arinas
Different fi
x
es for the branc
h
command
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-11-04
Cata
l
in Marinas
Add a
spa
c
e after ',' when building
the e-mail reci
p
ie
n
ts
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-11-04
Catalin Mar
i
n
as
Optimise the e
x
p
o
rt comma
n
d
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-11-04
Catali
n
M
arin
a
s
Add a patc
h
es
c
ommand
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-11-04
Ca
t
alin Mar
i
nas
Fix th
e
'files' initia
l
isation in git
.
c
hec
k
out()
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-27
Catali
n
Marinas
C
apture t
h
e
K
eyb
o
ardInterr
u
p
t
exception
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-27
C
a
tal
i
n
M
arinas
No
t
ify when a cherry-picked commit was modified by
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-27
Catal
i
n Marinas
Notify when a
pa
t
ch was modified duri
n
g
a
push operation
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-21
Cat
a
lin
M
ar
i
n
a
s
Allow the
e
d
i
t
i
ng of the cove
r
message
be
f
ore sending
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-17
Catalin Marinas
Fi
x
the bra
n
ch pro
t
ect
/
u
nprotect message
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-07
Ca
t
alin Marinas
F
l
ush the H
E
A
D
c
ache in
s
e
t_head_
f
ile()
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-06
Cat
a
lin Marinas
All
o
w the short
v
ersion of -
-
base (i
.
e
.
-b)
in import
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-06
C
atalin M
a
rinas
Use
g
it_id
i
n imp
o
rt and
fold instead of
g
it
.
rev
_
parse
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-06
C
atalin Marina
s
Fix the cach
i
n
g
of the
H
EAD va
l
ue
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-05
C
atalin Marinas
Ad
d
a --reset option to resol
v
ed
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-05
C
a
t
a
lin Mari
n
as
Allow
g
it
.
a
pp
l
y_patc
h
(
) to take a base
revision
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-05
Ca
t
alin Marinas
Add
a --fold option to pick
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-05
Catalin Marinas
TODO upda
t
ed with
the need for a 'prun
e
' command
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-05
C
atalin Marin
a
s
'
s
tatu
s
--reset'
s
hould remove the conflicts as
w
e
l
l
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-04
Catalin Marinas
Add the -
-
reset option
t
o
status
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-04
C
a
talin M
a
r
i
nas
A
d
d an uninstallable scri
p
t for pr
o
filing
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-04
Catalin
Marinas
Make
__commi
t
s
global in gi
t
.
py
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-04
Catalin Marin
a
s
Cache t
h
e H
E
A
D value
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-03
Catalin Marinas
Escape
th
e
unusual characters in the name <email> strings
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-03
Catalin Marinas
Optimise 'p
u
sh
'
t
o use git-
a
pply instead of git
-
r
ea
d
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-02
C
atalin Marin
a
s
Release 0
.
7
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-10-02
Cat
a
lin Marinas
U
p
date
t
he TODO file
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-27
Catalin Marinas
Ad
d
a com
m
it command to merg
e
the current patche
s
into
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-27
Catalin Marinas
Implem
e
nt a 'pi
c
k' com
m
and for c
h
erry-
p
icking
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-27
Catalin Mari
n
as
Can
c
el the commi
t
c
h
erry
-
picking in import
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-27
Ca
t
alin Marinas
A
d
d s
u
pport for bran
c
h in t
h
e patch
id
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-27
Catalin M
a
rinas
Add support f
o
r git-rev-pa
r
se
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-25
Catalin Marinas
M
ino
r
typos in the tutoria
l
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-23
Catalin M
a
rinas
A
d
d
the tut
o
rial back to the
r
epository
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-22
Cata
l
in Ma
r
inas
Fix impor
t
ing from s
t
din
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-18
Catalin
M
arinas
Fix the version_str as
s
ignment in mail
.
py
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-18
Catalin Marina
s
Specify a differ
e
n
t
base
f
o
r
the i
m
porte
d
patch
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-17
Ca
t
alin Marina
s
Che
c
k
whether the p
a
tch name is applied or un
a
ppli
e
d
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-17
Catalin Marinas
I
gn
o
re the case on
the P
A
T
C
H name when importing
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-16
Catalin M
a
r
inas
Allo
w
'
i
mport' t
o
cherry-
p
ick a commit object
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2005-09-14
Catalin Marinas
Pass -q to git-merge-cache
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
next