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
Convert "sink" to the new infrastructure
2009-04-09
Catalin Marinas
Convert "sink" to t
h
e
new infrastructure
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2009-04-09
Cat
a
lin Marinas
A
d
d automatic git-me
r
g
e
t
o
ol
inv
o
cation to the
new infrastructure
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2009-04-09
Catalin Marinas
Add mergeto
o
l
su
p
port t
o
the classic StGit in
f
rastructure
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2009-04-09
Catalin
M
arin
a
s
Check for
l
ocal changes
w
i
th "
g
ot
o
"
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2009-01-28
Catalin Marinas
Add --fil
e
option to
p
ick
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2009-01-28
C
a
talin Marinas
M
erge bran
c
h
'stable
'
commit
|
commitdiff
|
tree
2009-01-28
Catalin Marinas
P
a
ss the dif
f
flags when statistics are r
e
quired
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2009-01-14
Catalin Marinas
Fix th
e
p
a
tch arg
u
ment p
a
rs
i
ng for th
e
"show" command
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2009-01-01
Cat
a
lin
M
ar
i
n
a
s
Merge bra
n
c
h
'
p
roposed'
commit
|
commitdiff
|
tree
2008-12-03
C
a
talin Ma
r
inas
Print conflict
de
t
ai
l
s with the
n
e
w
i
nf
r
astructure
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-12-02
Catalin Marina
s
Do not append a new line to
the b
a
ckwards com
p
at fil
e
s
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-12-02
Cat
a
lin M
a
rin
a
s
Add "tags" target to
M
akefi
l
e
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-12-02
Catalin Marin
a
s
s/GIT/Git/
in the READ
M
E
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-11-29
C
atalin Marinas
Fix the HEA
D
upd
a
ting
durin
g
a confli
c
t
ing push (bug
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-11-21
Catali
n
Mari
n
as
Display (empty)
when appropriate for
t
h
e
goto command
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-11-08
Catalin Marinas
Merge
branch 'propos
e
d
'
commit
|
commitdiff
|
tree
2008-11-08
Catalin Marinas
A
dd 'pic
k
' test scr
i
pt
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-11-08
Catali
n
Marinas
Generate a d
i
ff
e
rent patch nam
e
if it
alrea
d
y exists
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-11-08
Catalin M
a
r
i
nas
A
l
low pick --fo
l
d to
work without
a
pplied patches
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-11-08
Catalin M
a
rinas
Re
f
r
e
sh of remove-
e
-ma
i
l
-
address-duplic
a
t
commit
|
commitdiff
|
tree
2008-11-08
Ca
t
a
l
in Ma
r
inas
Remove
e-mail addres
s
duplicates
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-11-08
Cata
l
in M
a
rinas
R
e
m
o
ve the --c
o
mm
i
t
ter options
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-11-01
Catalin M
a
rinas
A
d
d parse
_
patches boundary in the delete
.
py file
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-11-01
Catalin Marin
a
s
Change e-mail
u
ser
a
gent header to
S
t
Git
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-10-19
Cat
a
lin Marinas
Fix
"show
"
to allow multiple branc
h
:patch arg
u
ments
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-10-02
C
a
talin Marinas
U
s
e --di
f
f ra
t
he
r
than --patch
in log
.
p
y
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-09-19
Catalin
M
arinas
Mer
g
e branch 'st
a
ble'
commit
|
commitdiff
|
tree
2008-09-18
Catalin Ma
r
inas
F
ix the s
i
nk comma
n
d
for various
test cases
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-09-12
Catalin Marinas
Au
t
osign
ne
w
ly created patche
s
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-09-12
Catal
i
n
Mar
i
nas
Do not crash if a patch log ref is
missing
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-09-09
Cata
l
in
M
arinas
M
e
r
ge
branc
h
'stabl
e
'
commit
|
commitdiff
|
tree
2008-09-09
Catalin Mari
n
as
Fix import
to work
pro
p
erly in
s
u
b
d
i
rectories
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-09-09
Cat
a
lin
M
ari
n
as
Fi
x
the importing
o
f config
i
n
series
.
py
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-08-21
C
a
talin Mar
i
nas
Remove the duplicate utils
.
strip_leading functio
n
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-08-21
Catalin Marina
s
Remove the applied/unapp
l
i
ed
c
o
mma
n
ds
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-08-21
Catalin Marinas
Convert git_id() to the new id
f
o
r
m
at
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-08-21
Ca
t
alin Mar
i
nas
I
m
ple
m
e
nt a new pa
t
ch identif
i
c
ation scheme and id
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-08-21
Catalin Marinas
Allow e-
m
ails to b
e
sen
t
with the Unix sendmail t
o
ol
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-19
Cata
l
in Marinas
Fix exp
o
rt error introduced by r
e
c
e
nt convertion
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-08
Catali
n
M
arinas
Merge
branch 'stable'
commit
|
commitdiff
|
tree
2008-06-08
Catali
n
Marinas
Rele
a
se 0
.
14
.
3
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-08
Catalin Mari
n
as
A
dd test_pa
t
c
h
e
s
target to M
a
kefile
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-08
Catalin Marinas
Conver
t
"
i
nit" to the
new St
G
I
T
inf
r
a
structure
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-08
Catalin Marinas
Add stack creation and initialisat
i
o
n s
u
ppor
t
to lib
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-08
C
a
tali
n
Marinas
Create
a
git
.
Branch clas
s
a
s a
n
cestor of stac
k
.
Stack
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-08
Catali
n
M
arinas
R
e
name Repos
i
to
r
y
.
hea
d
to Repo
s
it
o
ry
.
h
e
ad
_
re
f
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-06
Catalin
Ma
r
inas
Allow stack
.
patchorde
r
.
a
l
l to r
e
turn hi
d
den patches
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-05
Cat
a
lin Marinas
Fix th
e
parse_pat
c
hes()
f
unct
i
on to
w
ork
with tuples
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-06-03
C
a
t
a
lin Marinas
Merge
c
o
mmit 'kha/safe'
commit
|
commitdiff
|
tree
2008-06-03
Catalin Marina
s
Merge b
r
a
n
c
h
'stab
l
e'
commit
|
commitdiff
|
tree
2008-05-28
C
atal
i
n Marinas
Conve
r
t
"export"
t
o
the n
e
w
infrast
r
ucture
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-05-28
Catalin Marinas
Convert
"top" t
o
t
h
e ne
w
in
f
rastructur
e
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-05-28
Catalin Mar
i
nas
Fix
e
rror in sta
t
us
.
py when calling gi
t
.
resolve
d
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-05-28
Cat
a
lin Marinas
Allow the Repo
s
ito
r
y
.
get_stack() to get a def
a
ult argument
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-05-28
Catal
i
n Mar
i
n
a
s
Rewrite the "series" command for th
e
new inf
r
astructure
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-05-28
Cat
a
lin Marinas
Refactor the Commitd
a
ta class to C
o
mmitData
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-05-27
Catalin Marinas
M
e
rge branc
h
's
t
a
b
le'
commit
|
commitdiff
|
tree
2008-05-27
Catalin
M
arinas
Fix
"refresh"
f
ailur
e
wi
t
h move
d
fil
e
s (bug 1
1
661
)
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-05-19
Catalin Marinas
Merge b
r
anc
h
's
t
able'
commit
|
commitdiff
|
tree
2008-05-19
Catalin Marinas
Al
l
ow ex
p
ort
to write una
p
plied files as well
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-04-17
Catalin Marinas
Merge branch
'
stable'
commit
|
commitdiff
|
tree
2008-04-17
Catali
n
Mari
n
as
Fix the sync'
i
ng o
f
unappl
i
ed p
a
tches only
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-25
Catalin Marinas
Merge
b
ranch 'stable'
commit
|
commitdiff
|
tree
2008-03-24
Catalin Marinas
Rel
e
ase 0
.
14
.
2
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Cat
a
l
in Mar
i
nas
Remove a
n
e
wline f
r
om the e-mail template
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Catalin Marinas
A
l
low p
i
cking
o
f one comm
i
t i
d
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Cata
l
in M
a
rinas
Allow picking
of
one commit id
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Catalin Marinas
Remo
v
e the reorde
r
ing
s
i
d
e-effe
c
t of the latter
s
y
nc
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Catali
n
M
a
rinas
R
emove the reordering side-effect of
t
he latter sync
.
.
.
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Catalin
M
arin
a
s
Fix sync to push th
e
popped
p
a
t
ches back after syn
c
'ing
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Catalin Marinas
Fix sync to
p
ush the popped patche
s
b
a
ck afte
r
s
y
n
c'i
n
g
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
C
a
ta
l
in Marinas
Ad
d
a
boundary to parse
_
patche
s
in p
i
ck
.
py
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Catalin Marinas
Add a boundary to parse_patches
in
p
i
c
k
.
py
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
C
a
talin Marinas
Refuse to
sen
d
empty p
a
tches
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Catalin Marin
a
s
S
et umask to 00
2
2 during th
e
s
e
tup
.
py execution
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
C
atalin Marinas
Re
f
use to send empty patches
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-24
Catali
n
Marina
s
Se
t
u
m
ask
t
o 0022 during the setup
.
py
e
x
e
c
u
tion
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
C
atalin
M
ari
n
as
Modify
'
series' to use '#' instead of '|'
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
Cat
a
lin Marinas
All
o
w the synchro
n
isation of the u
n
applie
d
patches
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
C
atalin Marinas
Check
f
or unnec
e
s
s
a
ry push
/
pop in 'floa
t
'
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
Catalin Marinas
Allow pick to import mul
t
iple patches
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
Catalin Marin
a
s
Don't set
the defaul
t
au
t
hdate if none spec
i
fied
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
Cat
a
lin Marinas
Modif
y
'series
'
t
o use '
#
' ins
t
ead of '|'
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
Catalin Marinas
Allow the synchronisatio
n
of the u
n
applied patches
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
C
atal
i
n Marinas
C
h
eck
for un
n
ece
s
sar
y
push/pop in 'float'
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
C
a
talin Marinas
Allow
p
ick to impo
r
t multiple
p
a
tches
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2008-03-20
Catalin Marinas
D
o
n't set th
e
default auth
d
ate if none specified
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-19
Cata
l
in Marinas
Remove
a
newline from
the e-mail template
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-19
Catalin Marinas
Remove un
u
sed git functions like add,
rm, copy
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-19
Catalin
Mar
i
nas
Remo
v
e multipl
e
s
tages return
e
d by gi
t
.
l
s_files
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-19
Catalin Mar
i
na
s
Don't assume t
h
e
r
e is always a stage 2 in git
.
g
e
t_conflicts
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-19
Cata
l
in Marinas
Re-add the
i
nteractive merge
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-11
C
a
talin Marin
a
s
Release 0
.
14
.
1
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-09
Catalin Marinas
R
e
lea
s
e 0
.
14
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-09
Catalin Marinas
Better
handling o
f
bin
a
ry fi
l
es (
b
ug #8495)
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-08
C
a
talin Ma
r
inas
Allo
w
o
nly certain gitk
ex
i
t codes
as valid
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-07
C
a
tal
i
n Marin
a
s
Make sure t
h
e r
e
fid given to 'mail' has the
a
n
g
le brackets
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-07
Catalin Marinas
Some clean-up
o
f the branch manipulation commands
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-07
C
a
t
alin M
a
rinas
Ignore th
e
gitk exit code in 'stg log -g' (bug
#
1
0010)
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
2007-12-07
Ca
t
a
l
in
Marin
a
s
Add th
e
'log --num
b
er'
o
p
t
ion
to l
i
mit the output
Signed-off-by:
Catalin Marinas
<catalin.marinas@gmail.com>
commit
|
commitdiff
|
tree
next