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
Add a second testcase for handling invalid strategies in git-merge
2008-07-30
Miklos V
a
jna
Add
a
second
testcase for hand
l
i
ng inv
a
lid s
t
r
a
tegie
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
Add
a new test
f
or
u
sing a custom merge
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
b
u
i
l
tin-me
r
ge
:
allow using a custom st
r
at
e
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bu
i
ltin-
h
elp: ma
k
e some
internal
f
unctio
n
s avail
a
b
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t
7
601: extend
the
'
m
erge picks up
the best resu
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a prope
r
erro
r
m
essage for in
v
alid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Vajna
Teach 'git
m
erge' that some
merge strategies
n
o lo
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
na
Add a new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
na
t602
1
:
a
dd a
new te
s
t for git
-
mer
g
e-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
ma
k
e r
e
move-dashes: apply
t
o scripts a
n
d programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bis
e
c
t
: use dash-less form
on g
i
t bis
e
ct
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
t
1007-hash-objec
t
.
sh:
use quote
s
for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
aj
n
a
t
0
0
0
1-init
.
sh: change confusi
n
g directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajn
a
Build in merg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
F
i
x t7601-
m
erge-pu
l
l-config
.
sh o
n
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
git-commit-tree: ma
k
e it us
a
ble from o
t
h
e
r buil
t
i
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add n
e
w test
case to ensure git-mer
g
e prepen
d
s the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
h
g-
t
o-git
:
use git
init inste
a
d
of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-
t
o-gi
t
: rewrite "git-frotz" to "git
f
rotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: abort if
the
proj
e
ct d
i
rector
y
i
s no
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-t
o
-
g
it: avo
i
d
r
a
ising a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
INSTA
L
L: Upda
t
e secti
o
n about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire
'
stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos V
a
jna
A
dd ne
w
test case to ensure
git
-
merge reduces oct
o
pus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add n
e
w test t
o
e
n
s
u
re git
-
me
r
g
e
han
d
les mo
r
e
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os Vajna
Introduc
e
get_octopus
_
m
e
r
ge_bases() in
c
omm
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
git-fm
t
-mer
g
e-msg: make it usable from oth
e
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Mo
v
e read_cache_u
n
m
erged() to
read-cac
h
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
dd new test to
ensure git-mer
g
e h
a
ndles pul
l
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
Vajna
M
ove par
s
e-opt
i
ons's
s
ki
p
_p
r
efix() to
git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move
commit_list_c
o
unt()
t
o commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
M
o
ve split_cmdline() to al
i
as
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
p
ath-
l
is
t
docum
e
ntation: do
c
um
e
nt all f
u
nctions
an
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
ru
n
-c
o
m
m
a
nd documen
t
ation:
fix "memset()"
paramet
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Va
j
n
a
git
-
re
a
d-tree:
d
o
cument -v o
p
tion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Va
j
na
A simple
s
cript to parse the results
from the
testca
s
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Va
j
na
git-rebas
e
-
i
: mention the short co
m
mand ali
a
ses in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
Remove unu
s
ed cod
e
in pars
e
_
c
ommit_buffer
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Str
b
uf documentation: document mo
s
t functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revi
s
ion walkin
g
do
c
umentation: do
c
u
m
e
nt
m
o
st important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s Vajna
Co
d
ingGuidelines: Ad
d
a note to avoid assignments in
s
i
d
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vaj
n
a
git-merge:
exc
l
ude unnecess
a
r
y
options fro
m
O
P
TIONS_SP
E
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
iklos Vajna
g
i
t-f
a
s
t
-i
m
port: rename cmd_*() functions to pa
r
se_*(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: add a note abo
u
t GNU interactive tools
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests f
o
r send
e
ma
i
l
.
cc conf
i
guration variabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
git-send-email:
a
dd a n
e
w
s
endemail
.
cc
configura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-format-pa
t
ch: add a ne
w
f
o
r
m
a
t
.
cc configurat
i
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mik
l
os Vajna
g
i
t
c
heck
o
ut:
a
d
d
-
t
a
l
i
as for
-
-tra
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
iklos Va
j
na
diff opt
i
ons do
c
umen
t
ation:
refer to --diff
-
filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
co
n
trib/hooks: add
a
n exa
m
p
l
e pre-a
u
to-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation/hooks: add pre-auto-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s V
a
j
na
git-gc --auto: a
d
d pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s
Vajna
D
ocumentation/git-
m
erge: do
c
u
m
ent subtree stra
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Updated Hunga
r
i
an t
r
an
s
lation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mikl
o
s
Vajna
Update H
u
ngarian transl
a
tion
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
los V
a
jna
Improve
t
6029 to
chec
k
the real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
klos Vajna
Docume
n
t
ation/git svn
l
og: add a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Document
a
ti
o
n/git-filter-br
a
nch: ad
d
a new
msg-filte
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: ha
n
dle
errors if
r
emoving
files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Vajna
Documentation/git-stash: do
c
umen
t
o
p
ti
o
n
s for git
sta
s
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklo
s
Vajna
git clone
-
s do
c
umentation: force
a
n
ew par
a
g
r
aph
f
or
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Vajna
b
uil
t
in
-
g
c
.
c: guard config
p
arser from value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
os Vajna
g
i
t
rev-parse man
p
age: spelling
f
ix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Va
j
na
git pull manp
a
ge: don't include -n
from fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Mikl
o
s Vajn
a
g
i
t-clone -s:
d
oc
u
ment pro
b
lems with git gc
-
-pru
n
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mik
l
os Vajna
Include r
e
v-l
i
s
t
options in
g
it-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mikl
o
s Vajna
ls-remote: add -t and -h optio
n
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vaj
n
a
A
d
d
using merge subtree How
-
T
o
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
V
ajna
t/t7001: avoid unnecessa
r
y ERE when using gre
p
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos V
a
jna
git-sh-
s
etup:
doc
u
ment
g
it_edit
o
r(
)
and
g
et_auth
o
r_id
e
nt_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
iklos V
a
jna
ever
y
d
ay: replace 'p
r
un
e
'
a
nd '
r
ep
a
ck' wi
t
h 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklo
s
Vajna
Upd
a
te Hungarian tra
n
slation
.
100% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os Vaj
n
a
I
n
clude di
f
f options in the git-lo
g
ma
n
pa
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klos Vaj
n
a
gi
t
-send-email: add
a n
e
w sendemail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klo
s
Vajna
git stas
h
: document apply's --index
s
witch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
g
it
-
bundle
:
fix com
m
a
n
d
l
in
e
examples
i
n
t
he m
a
npa
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajn
a
User Manual: a
d
d a chapter for submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mik
l
os Vajna
Hu
n
g
arian translation of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mikl
o
s V
a
jna
gitweb
:
new cgi parame
t
er: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: pr
e
f
e
r gi
t
_get_p
r
oject_ow
n
er
(
) over ge
t
_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Documen
t
-<
n
> for
git-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree