repo.or.cz
/
git
/
vmiklos.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2008-08-24
Miklos
V
a
j
na
Makefile: enable SN
P
RINTF
_
RE
T
U
RNS
_
BO
G
US for
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos Vajna
Fix 'gi
t
help h
e
lp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos V
a
jna
t9300: replace '!
'
with test_must_
f
ail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentat
i
on: docume
n
t
the
p
age
r
.
* co
n
figur
a
ti
o
n setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mi
k
los V
a
jna
Bu
i
lti
n
g
i
t-hel
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-help: al
w
ays load_co
m
mand_
l
ist() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
Add
a
second
testcase for handling inval
i
d st
r
a
tegies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
Add a new te
s
t for using a
custom
m
erge strat
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajn
a
b
u
ilti
n
-
m
e
rge:
allow us
i
n
g
a custom str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
bui
l
ti
n
-help: make some interna
l
f
un
c
ti
o
ns
availa
b
le
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
los
V
aj
n
a
t760
1
: extend t
h
e
'
merge pi
c
ks up the be
s
t resu
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos Vaj
n
a
builti
n
-me
r
ge: g
i
v
e
a
proper
e
r
ro
r
m
e
ssage for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Va
j
na
Teach 'git merge' th
a
t some merge s
t
rategies no
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
A
d
d a new test
for git-
m
e
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
V
a
j
na
t6021: add a ne
w
test for
g
it-merge-res
o
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
l
os V
a
jna
make re
m
o
ve-dashes: apply to
s
cripts and p
r
og
r
ams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
it-bisect:
u
se dash-less form on git bisect l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1
0
07-hash-object
.
sh
:
use
q
uotes f
o
r the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t00
0
1
-
init
.
sh: change confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos Va
j
n
a
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Fix t7
6
01-
m
e
r
ge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
gi
t
-commit-t
r
ee:
m
ak
e
i
t usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
los
V
ajna
Add new test
case
t
o
ens
u
re git-merge
p
repend
s
th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: use git init instead
o
f git ini
t
-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos
Vajna
hg-to-git:
rewrite
"
g
i
t-frotz"
t
o "
g
it
frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
h
g-to-git: abort if
t
he pro
j
ect dir
e
ctory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
n
a
h
g
-to-git: av
o
i
d
raisin
g
a str
i
ng exceptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
INSTALL: Update section abou
t
git-frotz
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
i
k
l
o
s
Vajna
Retire 'stupid'
m
erge
s
tra
t
egy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new test case to ensure git-merge
reduc
e
s o
c
topus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new test t
o
ensure git-merge
hand
l
e
s
more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introdu
c
e
get
_
oc
t
opu
s
_merge_bases(
)
i
n commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: make it
u
sable from
o
th
e
r bu
i
ltin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_ca
c
he_unmerged() to
r
ead-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
dd
n
ew te
s
t to ensur
e
gi
t
-
m
er
g
e
h
andles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
p
ar
s
e-op
t
ions's skip_prefix() to
g
it-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit
_
list_count() to commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klo
s
Vajn
a
Move spl
i
t_cmdl
i
ne() to a
l
ias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
p
ath-list docume
n
tation: document al
l
funct
i
ons a
n
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s Vajna
run-command documentati
o
n: fix
"memset()" parame
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
los
Vajna
git-rea
d
-tree: do
c
ument
-v
optio
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
A simple
script to parse the r
e
sul
t
s
from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vaj
n
a
git-rebas
e
-i: mention the short co
m
mand aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
Remove unused code in pa
r
se
_
c
ommit_b
u
ffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Va
j
na
Strbuf
documen
t
ation: document mos
t
functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos
V
a
j
na
Revision wa
l
king documentatio
n
: document most
i
mp
o
r
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s Va
j
na
Co
d
in
g
Gui
d
e
l
i
n
es: Add a note
t
o
a
void assignmen
t
s inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklo
s
V
ajn
a
git
-
merge: exclude unnecessary options from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s Vajna
git-fast
-
i
m
po
r
t
:
ren
a
me cmd_*() f
u
ncti
o
ns to p
a
rse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mikl
o
s Vajna
INSTALL: add a not
e
about
G
NU
i
nteracti
v
e tool
s
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
Add
tests for sende
m
a
il
.
cc
conf
i
gu
r
atio
n
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
g
i
t-
s
end-email: add
a new sendemail
.
cc configur
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajn
a
g
i
t-
f
o
r
mat-p
a
tch: ad
d
a
new
format
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
i
k
los
V
ajna
g
i
t checko
u
t: add -t
a
lias
for
--tra
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
ik
l
os
V
aj
n
a
d
if
f
options
d
ocume
n
tation: refer
t
o
-
-
d
i
ff-
f
i
lter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Va
j
n
a
contrib/hooks: add
an example pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation/hooks:
a
d
d pr
e
-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git
-
gc
-
-aut
o
: ad
d
pr
e
-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos
V
ajn
a
Documentation/git-m
e
rge
:
document subtre
e
strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Va
j
na
git-gu
i
: U
p
date
d
H
ungarian translati
o
n (e5
f
b
a18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mikl
o
s Vaj
n
a
Update Hungari
a
n tran
s
lation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
Vajna
Improv
e
t
602
9
t
o che
c
k t
h
e real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
D
o
c
umentati
o
n/git
svn
l
og
:
ad
d
a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
ikl
o
s Vajna
D
o
c
um
e
nta
t
ion/git
-
f
i
l
ter-br
a
nc
h
: add
a
n
e
w msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos
V
ajna
git-clea
n
: hand
l
e erro
r
s
if remo
v
ing files
f
ails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Doc
u
mentation/g
i
t-s
t
ash: document
o
pt
i
o
ns for g
i
t
stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git c
l
one -s docume
n
ta
t
ion: force a ne
w
paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
iklo
s
Vajna
builtin
-
g
c
.
c: guard config p
a
rse
r
fro
m
v
alue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
iklos V
a
j
na
git rev-parse manpage: spel
l
ing
f
ix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
a
jna
git p
u
l
l manpage: d
o
n't include -n from
f
e
tch-options
.
tx
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
Vajna
git-clone -s: docu
m
e
n
t prob
l
e
ms with g
i
t gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklo
s
V
a
jna
Include rev-list
options in git-l
o
g manp
a
ge
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
l
s
-re
m
ote: add -t and -
h
op
t
i
o
ns
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mik
l
os V
a
jna
Add using me
r
ge subtr
e
e Ho
w
-
T
o
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Va
j
na
t
/t7001: avoid unnec
e
ss
a
ry ER
E
w
h
e
n using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos V
a
jna
g
i
t-sh-se
t
up
:
docume
n
t
git_editor
(
)
an
d
get_a
u
t
hor_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: r
e
place 'p
r
une' and 'repack'
with 'g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Vajna
Update Hungarian
transla
t
ion
.
1
00%
c
ompleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include
di
f
f opti
o
ns in the git-lo
g
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mik
l
os Vajna
git-se
n
d-email: add a new se
n
dema
i
l
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mikl
o
s Vaj
n
a
git stash: document apply's -
-
index switch
commit
|
commitdiff
|
tree
2007-09-29
M
i
klos Vaj
n
a
gi
t
-
b
un
d
l
e: f
i
x
commandline examples
in the
man
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
U
s
er
Manua
l
: add a chap
t
er f
o
r
submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
M
iklos Vajna
Hun
g
arian translati
o
n of gi
t
-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mi
k
los Vajna
git
w
eb
:
new cgi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
os Vaj
n
a
gitweb: pref
e
r
g
it_get_project
_
owne
r
() over get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mi
k
los Vajna
Document -<
n
> for git-format-
p
atch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree