repo.or.cz
/
git
/
git-bigfiles.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a second testcase for handling invalid strategies in git-merge
2008-07-30
M
i
klos V
a
jna
Add a second testca
s
e for
handling invalid st
r
a
t
egies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new test for usi
n
g a custom merge
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bui
l
tin-m
e
rge: allo
w
using a custom strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
l
o
s
V
a
j
na
builtin-
h
e
lp:
make
s
ome internal f
u
nctio
n
s available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklo
s
Vaj
n
a
t
7
6
01: exten
d
the 'merge pick
s
up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos V
a
jna
buil
t
i
n-merge: give a prop
e
r error messag
e
for
invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os
Vajna
Teach 'g
i
t
merge'
that
some merge str
a
tegi
e
s
no
l
onger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new test for git-merge-re
s
o
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t60
2
1: add a new te
s
t for
git-
m
erge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
o
s
Vajna
ma
k
e
remove-dashes: apply to sc
r
ipts and pro
g
rams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos
Vajna
git-bisect: u
s
e dash-less
f
orm on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
1
007-hash-object
.
s
h: use
quotes for the test
description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t000
1
-ini
t
.
sh
:
change confusing d
i
r
e
ctory nam
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fi
x
t7601-merge-p
u
ll-config
.
s
h on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
it-co
m
mit-
t
ree: make
i
t usab
l
e from othe
r
b
u
i
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test cas
e
to ensure git-merge prepe
n
d
s th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to
-
gi
t
:
u
s
e git init instead
o
f git i
n
it-d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
j
n
a
h
g-
t
o
-
g
i
t: rewrite "git-fro
t
z"
to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: abort if t
h
e project directory
i
s
n
ot a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to
-
git:
a
v
o
id
r
aising a str
i
n
g
ex
c
eption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: U
p
dat
e
se
c
tion about g
i
t-f
r
o
t
z f
o
rm
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mikl
o
s Vajna
R
e
tire 'stupid
'
merge str
a
tegy
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Add new t
e
st case to ensure gi
t
-
m
erge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
A
d
d ne
w
test to
e
nsure git-merge handles
more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
In
t
roduce get_
o
c
to
p
u
s
_merge
_
ba
s
es() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
a
jna
git-fmt-merge-
m
sg: make it usabl
e
f
ro
m
oth
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Va
j
na
Move rea
d
_cache_unmerged() to read
-
c
ache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test to
e
nsur
e
git-merge handles pull
.
twohea
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
v
e
par
s
e-options's skip_pr
e
fix() to git-
c
ompa
t
-
u
ti
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
M
o
v
e
c
ommit_list_cou
n
t
(
)
t
o
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Mo
v
e split_
c
md
l
ine(
)
t
o
a
l
ias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path
-
list do
c
umentation: document all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-comm
a
nd d
o
cu
m
entation: fix
"
mem
s
et()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos V
a
jna
git-read-
t
ree: document -v op
t
io
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
A simple script
t
o parse the
results fro
m
the t
e
stc
a
ses
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Va
j
n
a
g
i
t
-
r
e
b
a
se -i
:
mention the s
h
ort comm
a
nd a
l
iases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
kl
o
s Vajna
Remove unused
c
ode in par
s
e_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf documentation: docume
n
t
m
ost f
u
nctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
i
k
lo
s
Vaj
n
a
Revis
i
on wal
k
in
g
documentation: document most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklo
s
Vajna
CodingG
u
idelines: Add
a note
to avoid assig
n
m
e
nts inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mik
l
os Vajna
g
it-merge: excl
u
de unnece
s
sary options from
O
PTI
O
NS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s Vajna
g
i
t-fast-impor
t
: rename cmd_*() functions
t
o
parse_*
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
IN
S
TA
L
L
:
a
dd a n
o
te about GNU intera
c
tiv
e
t
o
ol
s
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Ad
d
tests for sendemail
.
cc co
n
figuratio
n
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
o
s Vajna
git-send-ema
i
l: add a new sendemail
.
c
c configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-format-patch: add a n
e
w format
.
cc configurati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mi
k
lo
s
Vajna
git
c
h
eckout:
a
d
d
-t
alias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
l
o
s Vajn
a
d
iff opt
i
ons document
a
tion: refer to
--diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/hooks: a
d
d an example pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
Do
c
umentation/hook
s
:
a
d
d pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
l
o
s Vajna
git-gc --aut
o
: add pre
-
auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Docum
e
ntation/git-merge: docum
e
nt su
b
tr
e
e strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
it-gui:
Upda
t
ed Hunga
r
ian translation (e5
f
ba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
l
o
s
Vaj
n
a
Update Hungarian translat
i
on
.
100
%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Impro
v
e
t6029 to check the
r
e
al
"
subtree" c
a
se
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
D
ocum
e
ntation/gi
t
s
vn log: add a not
e
about
ti
m
ezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s Vaj
n
a
Docum
e
ntat
i
on
/
gi
t
-filter-b
r
a
nch
:
a
d
d a new msg-
f
ilter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-
c
le
a
n:
h
andle error
s
if removing files fa
i
ls
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Do
c
umentation
/
git-stash: d
o
cument option
s
f
or git
stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
M
i
klos Vajna
git clone -
s
documentation: force a new paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builti
n
-gc
.
c
:
g
uard config pars
e
r
f
r
om value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-parse m
a
npage: spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull
manpage: don't incl
u
de
-n f
r
om fetch-op
t
ions
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
V
aj
n
a
g
i
t-clone
-
s: docum
e
nt problems
w
ith
git gc
-
-prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
i
klos Vajna
Incl
u
de rev-
l
ist opt
i
ons in git-log
manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos
Vajna
ls-remo
t
e: a
d
d
-
t
and -h
op
t
ions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mi
k
l
o
s Vajna
Ad
d
using merge s
u
btree How
-
T
o
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/
t
70
0
1
:
avoid un
n
eces
s
ary ERE when
u
sing gre
p
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-se
t
u
p
: doc
u
ment gi
t
_edit
o
r()
and get_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vaj
n
a
e
veryda
y
: replac
e
'pr
u
ne' and 'repac
k
' with
'
gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Vajna
Up
d
a
te
Hun
g
aria
n
translatio
n
.
1
0
0% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os Vajna
Include
diff options in the
git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mikl
o
s Vajna
git-send-emai
l
: add a new sendemail
.
to con
f
i
g
u
ra
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mikl
o
s Va
j
na
git st
a
sh: d
o
cument
a
p
p
ly's --index switch
commit
|
commitdiff
|
tree
2007-09-29
M
iklos Vajna
git-bundle:
fix
c
omm
a
ndline examples
i
n the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklo
s
Vaj
n
a
U
s
e
r Manual:
add a chapter for
submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hun
g
ar
i
a
n
transl
a
tion of git-
g
ui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vaj
n
a
gi
t
web: ne
w
cgi parame
t
e
r
:
opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
os Vajna
gitweb: prefer git_g
e
t_project_ow
n
er() over get_f
i
le_owner
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mikl
o
s Vajn
a
D
o
cument -<n> fo
r
g
i
t-fo
r
mat
-
patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree