repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-check-attr(1): add output and example sections
2008-10-14
Miklos Vajna
Add testcase
to e
n
su
r
e merg
i
ng an early part
o
f
a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklo
s
V
a
j
na
test-l
i
b: fix colo
r
reset in say_color
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
t
7
5
0
1
:
always use tes
t
_
c
m
p
ins
t
ead o
f
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Mak
e
f
i
le
:
add
m
erge_r
e
cursive
.
h
t
o LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos Vajna
Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
i
kl
o
s Vajna
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos V
a
jna
t
9300: replace '
!
' with t
e
st
_
m
u
st
_
fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos
Vajna
D
oc
u
ment
a
ti
o
n: documen
t
the
pager
.
* c
o
nfiguration setti
n
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajn
a
t7601
:
e
x
t
e
nd
t
h
e 'merge
p
icks up
t
h
e be
s
t
resul
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builti
n
-merg
e
:
g
i
ve
a
prope
r
error mess
a
g
e
f
or invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os Vajna
Teach '
g
it m
e
rge' that some merge strategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
A
dd a new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
t6021: ad
d
a
ne
w
test for git-merge
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
mak
e
remove-dashes:
a
pply to
scripts and
prog
r
ams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
j
n
a
g
it-bi
s
e
c
t: use da
s
h-
l
ess form on
git
b
isect
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t10
0
7-
h
ash-object
.
sh:
use quotes fo
r
t
h
e test descrip
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
t0001-init
.
sh:
c
hange confusin
g
di
r
ectory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los Vajna
Build in
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
Fix
t7601-merg
e
-p
u
ll-con
f
ig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
it-c
o
mmit
-
tr
e
e: make
it
usable from other
b
u
ilti
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
A
d
d
new test ca
s
e to
e
ns
u
re git-merge
prepen
d
s
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-git
:
use git init inst
e
ad
o
f git in
i
t-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klo
s
V
ajna
hg-to-git: rewrite "git-frotz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-
g
it
:
abort
if the project di
r
ectory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git:
avoi
d
rai
s
ing
a str
i
n
g ex
c
ept
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
INSTALL: Update se
c
tion a
b
out git
-
frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Retire 'stup
i
d'
merge
s
trategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add ne
w
test case to ens
u
re
g
it-merge reduces
o
ctopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Add n
e
w test
t
o
e
nsure git-merg
e
ha
n
dle
s
more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Intro
d
uce get_octopus_mer
g
e_ba
s
es() in
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Va
j
na
git-fmt-merge-msg: make it
u
sable from o
t
her bui
l
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cache_unm
e
r
ged()
to re
a
d-c
a
che
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
ne
w
test to ensur
e
git-merg
e
handles pull
.
t
w
o
h
ead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove p
a
r
s
e-opt
i
ons's s
k
i
p_prefix() to git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
V
ajna
Mo
v
e
com
m
i
t
_list
_
count(
)
t
o
com
m
it
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajn
a
Move split
_
c
m
dline
(
) to ali
a
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-list
d
ocumentation: doc
u
ment all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
r
u
n-co
m
mand documentat
i
o
n
:
f
i
x "m
e
mset
(
)" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
g
i
t-read-
t
ree: document
-
v
o
p
t
i
on
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
l
o
s Vajna
A
sim
p
l
e
scr
i
pt to parse the results f
r
om the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
git-
r
eb
a
se -i: mention
t
h
e short
c
o
m
m
a
nd ali
a
ses in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove u
n
used
c
o
d
e in
p
arse_commit_b
u
ffer
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
ik
l
os V
a
j
n
a
Str
b
uf documenta
t
ion: docume
n
t
m
ost
fu
n
ctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
ikl
o
s
Vajna
Revision walking
documentatio
n
: document mos
t
imp
o
rtant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
iklos Vaj
n
a
CodingGuidelines:
A
dd a note t
o
avoid assignmen
t
s ins
i
d
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mik
l
os Vajna
git
-
merge: excl
u
de unnecessary opt
i
ons
f
r
om
O
PTIONS_
S
PEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s Vajna
git-f
a
st-import: rename cmd_
*
()
f
unctions to pars
e
_
*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajn
a
INSTALL: a
d
d a
n
ote abou
t
G
NU interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los Vajna
Add te
s
ts
for sendem
a
i
l
.
cc configu
r
a
tio
n
var
i
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajn
a
git-send-
e
mail: add a
n
e
w
sendemail
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-format-pa
t
c
h
: add a new
f
ormat
.
c
c
conf
i
g
urati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git chec
k
o
ut
:
a
dd -t
alias
f
or --
t
r
a
ck
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
di
f
f optio
n
s
d
o
cumen
t
ation
:
re
f
er
to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
contrib/h
o
ok
s
: add an example pre-au
t
o-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation/hooks:
add
p
r
e-auto-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git
-
gc
--auto: add pre
-
auto-gc ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Docu
m
enta
t
ion
/
gi
t
-merge: d
o
c
u
ment subtree
str
a
tegy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
i
k
l
os Vajna
git-gu
i
: Updated Hungar
i
an translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
V
a
j
na
Update
H
ungarian translation
.
100% compl
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
Mikl
o
s Vajna
Improv
e
t602
9
to check the real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
V
a
j
na
D
o
c
um
e
ntation/git svn log: add a note ab
o
u
t
timezo
n
es
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mi
k
los Vajna
Documentation
/
git
-
f
ilter-b
r
an
c
h: add a
n
e
w msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
g
it-clean: hand
l
e errors if removing fil
e
s fai
l
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Docum
e
nt
a
ti
o
n/git-sta
s
h: document options for
g
it stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Va
j
na
git c
l
one
-s doc
u
mentation:
force
a new
p
arag
r
aph fo
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos V
a
jna
b
u
iltin-
g
c
.
c: guard config
parser from
value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mikl
o
s Vajna
git rev-
p
arse ma
n
page:
s
p
e
lling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
ajna
git pull
manpage: don't
i
nclude -n from
fetch-options
.
t
xt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Mik
l
os
V
a
j
na
git-c
l
on
e
-
s: docume
n
t
p
rob
l
ems with git gc --
p
rune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mikl
o
s Vajn
a
Include rev-
l
ist options in git-
l
og
m
a
n
p
ag
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos
V
ajna
ls-r
e
m
ote
:
a
dd -t and -h op
t
ion
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add using merge
subtree
H
ow
-
To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
iklo
s
Vajna
t
/
t
7
0
01: avoi
d
unn
e
cessary ERE when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mi
k
los Vajn
a
g
it-sh-s
e
tup: d
o
cument git_editor() and ge
t
_a
u
thor_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos
V
a
jna
eve
r
yday:
r
epl
a
c
e
'prune'
a
n
d 'rep
a
ck' with
'g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos
V
a
jna
Update
H
ungar
i
an tr
a
nslation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Vajn
a
Includ
e
di
f
f
o
ptions in the git-log manp
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mikl
o
s Vajn
a
git-se
n
d-e
m
a
i
l: add
a
n
ew sen
d
e
m
ail
.
to c
o
nfigurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git s
t
ash: document apply's --index swi
t
ch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
g
i
t-bu
n
dle: fix command
l
ine
e
xampl
e
s in the m
a
npage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Ma
n
ual: add a
chapter fo
r
submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungar
i
an tra
n
slation
o
f
git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklo
s
Vajna
git
w
eb:
n
e
w
cgi
p
arameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos V
a
jna
gitweb: prefer git_g
e
t_proj
e
ct_owne
r
() over
g
et_file_
o
wner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Document -<n> for git-format
-
pat
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree