repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/merge-blobs' into maint
2012-12-27
Ramk
u
mar Ramachandra
Docu
m
entati
o
n: m
o
ve diff
.
wordReg
e
x
fro
m
config
.
txt
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-12-02
Ramku
m
a
r Ra
m
achandra
t4041 (
d
iff-sub
m
o
du
l
e-optio
n
)
: modernize
sty
l
e
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-12-02
Ramkumar Ramachandra
t40
4
1 (diff-submodule-opt
i
on)
:
rewrite add_file() routine
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-12-02
Ramk
u
mar Ramac
h
andra
t4041 (diff-
s
ubmodule-option):
p
a
rse digests sensibly
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-11-27
Ram
k
umar Ramachandra
t4041 (diff-subm
o
dule-o
p
t
i
on): don't hardco
d
e
SHA-1
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-11-19
R
a
mkum
a
r Ram
a
ch
a
ndra
sub
m
odule: displ
a
y summary
header i
n
bo
l
d
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-11-19
Ramkumar
Ramachandra
dif
f
: introduce
diff
.
submo
d
ule
c
o
n
figuration va
r
iable
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-11-19
Ramkumar Ramachandra
Docu
m
entation: move
diff
.
wo
r
d
Re
g
ex from config
.
txt
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-11-12
R
a
m
k
umar Ramachandra
r
e
mote-hg:
a
dd missing config for basic tes
t
s
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-10-08
R
amkumar Ramachandra
G
it
u
rl doc: ma
r
k ftp/ftps as read-onl
y
and
d
eprecate
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-10-02
Ramkumar Ram
a
chandra
Documen
t
ation
:
mention `push
.
de
f
ault` in
g
it-p
u
sh
.
txt
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Ra
m
kumar Ramac
h
and
r
a
s
ubmodu
l
e: if $command was
not match
e
d, don't parse
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
R
a
mk
u
mar Ramach
a
ndra
test-
l
ib: use $SHE
L
L_
P
ATH,
n
o
t $SHELL
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
R
a
mkuma
r
Ramachandra
t/
t
e
s
t-lib:
m
ake sur
e
Git has already been b
u
ilt
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-09-17
Ramkumar Ram
a
chandra
t/perf: add "
t
r
ash dire
c
t
o
ry" to
.
gitig
n
or
e
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-06-08
R
a
mkumar Ramach
a
ndra
commi
t
: document a couple
of o
p
tio
n
s
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-06-04
Ramkumar Ramachandra
t3510
(
cherry-pick-
s
eque
n
ce): add missing '&&'
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-01-12
Ramkumar Ramachandra
sequencer:
f
actor code
out
o
f r
e
vert builtin
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2012-01-12
Ramkumar Ramachandra
revert: prepare
t
o
m
ove rep
l
ay_actio
n
to hea
d
e
r
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-15
Ramku
m
ar
Ram
a
chandra
t3502,
t3510
:
clarify cherry-pick -m failure
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-15
Ramkumar Ramachandra
t3510 (cherr
y
-pick-sequencer): use exit
s
tatus
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-15
Ra
m
kumar Ramachandra
revert
:
si
m
plif
y
get
t
ing commit
s
u
bject in form
a
t_tod
o
()
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-15
Ramk
u
mar Ram
a
cha
n
dra
r
evert: tolerate extra s
p
aces
,
tabs
i
n insn sh
e
et
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-15
Ramkumar Ramacha
n
dra
rever
t
: make commi
t
subje
c
ts in insn sh
e
et optional
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-15
Ra
m
kumar R
a
machandra
revert: fre
e
msg in
for
m
at_todo()
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar Ramachandra
t3040
(
subprojects-b
a
s
ic):
f
ix
'
&&' chain
i
ng, moder
n
ize
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar
R
amachandra
t1510
(
worktree): fi
x
'&&
'
chaining
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-09
Ramku
m
ar Ramacha
n
d
ra
t
3030 (merge
-
recursi
v
e): use te
s
t_e
x
pect_code
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar Ramachandra
t
est: fix '&&' cha
i
nin
g
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar Ramacha
n
dra
t3200 (branch): fix
'&&' chaining
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramku
m
ar Ramachandra
reve
r
t: p
r
ettify fata
l
messages
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-11-16
R
a
mk
u
ma
r
Ramachandra
git-co
m
p
at-util:
don't assum
e
value fo
r
undefined
v
a
riable
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-11-16
Ra
m
kumar Ra
m
achandra
sha1_file: don't mix en
u
m w
i
th int
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkumar Ram
a
c
h
an
d
ra
conver
t
:
d
on'
t
mix en
u
m with in
t
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkumar R
a
machandra
http: remove
u
n
use
d
func
t
ion hex
(
)
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-08
Ramku
m
ar Ramachandra
revert: Propagate
errors up
w
ards fro
m
do_pick_commit
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-08
Ramkumar
R
am
a
cha
n
d
r
a
revert: Introduce --conti
n
u
e
t
o
c
ontinue the operation
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-08
Ra
m
k
u
mar Rama
c
hand
r
a
revert:
Don't implic
i
tly stomp pending sequencer operat
i
on
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-08
Ramkumar Ramacha
n
dra
revert:
Remove sequen
c
er sta
t
e
w
hen no commits are
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-08
Ram
k
umar Ramachandra
reset:
Make reset remove the s
e
que
n
cer state
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ra
m
ku
m
ar Ramachandra
revert: Introduce --reset to re
m
o
v
e sequencer state
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
R
a
mkumar Ramachandra
revert: Mak
e
pick_co
m
mits functi
o
nally act on a commit
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
R
am
k
umar Ramachandra
revert: Save
c
o
m
m
and-line options for
contin
u
ing operati
o
n
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
R
amkumar
Ramachandra
revert: Save d
a
ta for cont
i
n
u
i
n
g after conflict resolution
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ramk
u
ma
r
Rama
c
handra
rever
t
:
D
on'
t
create invalid replay_
o
p
ts in
parse
_
args
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ra
m
kumar Ramachandra
r
evert: S
e
pa
r
ate cmdline parsing from functional code
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ramkumar Ramachandra
reve
r
t: Intro
d
uce struc
t
to keep command-line
opt
i
ons
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ramkumar Rama
c
handr
a
r
e
v
ert: Elimin
a
t
e
g
l
obal
"
commit" variable
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ramkumar Ramachandra
r
evert: Rename no_replay
t
o record_
o
r
i
gin
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ramkumar
R
amach
a
nd
r
a
re
v
e
r
t: Don't check lone argume
n
t
i
n get_encoding
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ramkum
a
r Ramachand
r
a
rev
e
rt: Simplify and
i
nli
n
e
add_
m
essage
_
to_msg
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ramkumar
Rama
c
handr
a
config: Introduce functi
o
ns to wri
t
e n
o
n-
s
tan
d
ard file
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-08-04
Ramk
u
mar
R
amachand
r
a
adv
i
ce: Intr
o
duce error_
r
e
s
o
l
v
e_confl
i
ct
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ram
a
ch
a
ndra
revert: Hid
e
'-r' opt
i
on in d
e
faul
t
u
s
age
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-04-06
Ram
k
umar Ram
a
chand
r
a
D
o
c
u
mentation: Al
l
o
w
custom diff t
o
o
l
s to be spec
i
fied
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-04-06
Ramkumar Ra
m
achandra
Docume
n
t
a
tion
:
Add dif
f
.
<
driver>
.
* t
o
config
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-04-06
Ramkum
a
r Ramach
a
ndr
a
D
o
cumenta
t
io
n
: Move diff
.
<driver>
.
* fr
o
m
config
.
txt
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-04-06
Ramkumar
Ramach
a
ndra
Doc
u
m
e
n
tat
i
on:
Add filte
r
.
<driver>
.
* t
o
co
n
fig
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2011-01-18
R
a
m
k
u
mar Ramachandra
fast-import: Introdu
c
e --im
p
o
r
t-m
a
rks-if-exists
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-11-24
Ram
k
u
mar Ramachandra
t9010 (svn-fe):
Eliminat
e
dependen
c
y
on
s
v
n
pe
r
l bindings
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-10-28
Ra
m
kumar Ra
m
achandra
Porc
e
l
a
in scripts: Rewrite cryptic "needs update" error
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
R
amkuma
r
Ra
m
achandra
Submi
t
tingPatches: Documen
t
s
om
e
extra t
a
gs used
i
n
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramku
m
ar Ra
m
a
c
han
d
r
a
t6
2
00-fm
t
-merge-
m
sg: Exercise '--log' to configur
e
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramach
a
n
dra
t6200-
f
mt-merge-msg: Exercise 'merge
.
log' to
c
onfigure
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramk
u
mar R
a
macha
n
dra
merge: Make 'merge
.
log' an integer
o
r boolean
option
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar R
a
machandra
merg
e
: Make '--log' an integer opti
o
n fo
r
number of
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkuma
r
Ramacha
n
d
ra
fmt_merg
e
_
m
s
g: Change fmt_merge_msg API to accept
s
h
o
r
tlog_len
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-08-27
Ram
k
umar Ra
m
achan
d
ra
for
m
a
t-pa
t
ch: Don
'
t
go
o
ver merge c
o
mmits
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-08-27
Ramkumar R
a
machandra
t
4
0
1
4-format-
p
a
t
c
h: Call test_tick before committing
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Ramkum
a
r
Ramachandra
shel
l
:
R
ewri
t
e docum
e
ntati
o
n and
impr
o
v
e e
r
ror messa
g
e
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar Ramac
h
a
nd
r
a
bu
i
ltin/che
c
kout: Fi
x
message when switching t
o
an
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-08-03
Ramkumar Rama
c
h
a
n
d
ra
con
t
r
i
b/
s
vn-fe: Add the sv
n
-
fe ta
r
ge
t
to
.
g
itignore
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-08-03
R
amkumar Ramachan
d
ra
co
n
tr
i
b/svn-
f
e
: Fix Includ
e
Path
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-06-07
Ramku
m
ar R
a
m
ac
h
andra
Refactor p
a
rse_date for app
r
o
x
i
d
ate functions
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Ra
m
kumar Ramach
a
ndra
git am: Remove stray error
messag
e
from sed
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Ramkumar Rama
c
han
d
r
a
g
it am:
D
i
splay some help text wh
e
n patch
i
s empty
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
R
amkumar Ramachandra
git am: Set
c
mdline globally
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-04-19
Ramkumar
R
amac
h
and
r
a
Submitti
n
gPatches: Add new section about
w
hat to
ba
s
e
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ram
a
chandra
Do
c
umenta
t
ion/remote
-
helper
s
:
Fix
t
ypos and i
m
prove
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramk
u
mar Ramachandra
F
ixup: Second ar
g
u
ment m
a
y be any arbitrary
s
tring
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramach
a
ndra
D
ocumentation/re
m
ot
e
-helpers: Add inv
o
cati
o
n s
e
ctio
n
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-04-18
R
am
k
umar Ramachand
r
a
Do
c
umentation/urls:
R
ewrite to accom
o
da
t
e <transport
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-04-18
Ra
m
kumar
Ramachandra
D
ocume
n
tation/remo
t
e-hel
p
ers: Rewrite
d
escription
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-03-24
R
a
m
kumar Ramac
h
andra
imap-send: Re
m
ove lim
i
t
a
tion on message
b
o
dy
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-01-17
Ramkumar Ramachandra
Documentation: Upda
t
e
g
it core tutorial c
l
arifying
.
.
.
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Ramkuma
r
Ramac
h
andra
Document
g
it-blame
t
riple -C option
Signed-off-by:
Ramkumar Ramachandra
<artagnon@gmail.com>
commit
|
commitdiff
|
tree