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
t7601: extend the 'merge picks up the best result' test
2008-07-23
M
i
klos Vajna
t7601: extend the '
m
erge
picks
u
p
t
h
e
best res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
ik
l
os Vajna
builtin-merge: give a
p
r
o
per erro
r
message fo
r
invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
V
ajna
Tea
c
h 'git merge' tha
t
some merge strat
e
gies no l
o
nger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Ad
d
a
new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os Vajna
t6021: ad
d
a new test for g
i
t-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
ma
k
e
re
m
o
v
e-dashes: appl
y
to scrip
t
s and programs
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
git-
b
i
s
e
c
t: use d
a
sh-less
f
orm on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
ik
l
os
V
a
j
na
t1007-has
h
-object
.
sh: use quotes for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajn
a
t0001-init
.
sh: change confusing
di
r
ectory nam
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
iklos Vajna
Build
in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Fix t7601-merge-p
u
ll
-
config
.
s
h
o
n AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
g
it-
c
o
m
mit-tre
e
:
mak
e
it usable
f
rom other bui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
Add new
test c
a
se t
o
ensure
g
it-m
e
rge
p
r
e
pends th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-git: use g
i
t init instead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Va
j
na
hg
-
to-git: rewrite
"git-frot
z
" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
h
g
-to-git: abort if the proje
c
t
directory i
s
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-git: av
o
id raising a
s
tring excepti
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: Update s
e
c
t
ion about git-
f
r
otz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
i
klo
s
Vajna
Retire 'stupi
d
' m
e
rge
s
tra
t
egy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case to ensure g
i
t-merge re
d
uc
e
s octop
u
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
V
a
jn
a
Add new test to ensure git-merge ha
n
dles m
o
r
e
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os V
a
jna
Int
r
oduce
g
et_octopus_
m
erge_bases(
)
i
n
comm
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Vajna
git-fmt-merg
e
-msg
:
make
i
t usable
from other
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
jna
Move rea
d
_cache_unm
e
rged() to read-
c
ache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Add new test to ensure git-merge handles
p
u
l
l
.
tw
o
head
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move parse-options's
s
kip_prefix() to git-compat-ut
i
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove c
o
mm
i
t_list
_
co
u
nt() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move
split_
c
mdline() to al
i
as
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
p
a
th-
l
ist
d
ocume
n
tation:
d
ocument all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command documentati
o
n: f
i
x
"memset()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mikl
o
s Vajna
gi
t
-
r
ead-tre
e
:
documen
t
-v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
A simple scr
i
pt to parse the
results fro
m
the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
git-rebase -i: mentio
n
t
h
e short comman
d
aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Va
j
na
Remove unused code in
parse_com
m
i
t_
b
uffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklo
s
Vajna
Strbuf docume
n
t
a
tion: doc
u
m
ent m
o
st
f
unctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revi
s
ion w
a
lking documentation:
doc
u
men
t
m
o
s
t import
a
n
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
iklos Vaj
n
a
CodingGuidel
i
nes: Add a note to
avoi
d
a
s
signments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
i
k
los
V
a
j
n
a
git
-
me
r
ge:
e
x
clude unnecess
a
ry options fr
o
m OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos V
a
jna
git-fast-import: rename cmd_*() functions to par
s
e_*
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
V
ajna
IN
S
TALL: add a n
o
te about G
N
U intera
c
tive too
l
s ha
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
a
j
na
Add te
s
ts fo
r
sendem
a
il
.
cc co
n
figur
a
tion variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajna
g
i
t-send
-
e
m
ail: a
d
d a new
sende
m
a
i
l
.
cc
c
onf
i
g
uration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vaj
n
a
g
i
t-f
o
rm
a
t-patch: add a new format
.
cc c
o
n
figu
r
ati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mikl
o
s
Vajna
git checkout: add
-t alias for --
t
rack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os Vajna
di
f
f option
s
do
c
umenta
t
ion: refer to --diff-filte
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Va
j
na
contri
b
/ho
o
ks: add an examp
l
e pre-auto-g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Doc
u
me
n
tation/hooks: add pre-aut
o
-gc h
o
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
git-gc --auto
:
add pr
e
-auto
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mi
k
los Vajna
D
ocumenta
t
ion/git-merge:
d
oc
u
ment
sub
t
r
e
e
s
tr
a
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
l
o
s
Vajna
g
it-gui: Updat
e
d Hungar
i
a
n
translation (e5fba1
8
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
los Vajna
Updat
e
Hungari
a
n
t
r
anslation
.
1
00%
c
omplet
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improv
e
t6029 to check the real
"sub
t
ree"
ca
s
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Docume
n
tation/git svn log: add
a
note
a
bout
timezo
n
es
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos Vajna
D
o
cumentation/
g
it-filte
r
-
branch:
a
dd a n
e
w msg-
f
ilte
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajn
a
g
it-clean: handle errors
i
f removin
g
files
fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos V
a
jna
Document
a
t
i
o
n
/
g
it-stash
:
document opt
i
ons for g
i
t
sta
s
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mik
l
os Vajna
git clone -s documentation: force
a new para
g
raph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajn
a
builtin-gc
.
c: guard config parser from value=NU
L
L
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
i
kl
o
s Vajna
git
rev-pars
e
manpag
e
: spel
l
ing fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
klos
V
ajna
git pul
l
m
a
npa
g
e: don
'
t include -n
f
ro
m
fetch-options
.
t
x
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
Vajna
git-
c
lone -s: document problems with git gc -
-
prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
iklos Vajna
Include rev-l
i
s
t
option
s
in gi
t
-log manp
a
ge
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos V
a
jna
ls-remote: ad
d
-t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
i
klo
s
Vajna
Add using merge sub
t
ree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
iklos Vajna
t
/
t700
1
: avoid unnecessary ERE w
h
en using gr
e
p
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh
-
setup: docume
n
t
g
it_editor() an
d
get_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
ev
e
r
y
day: replace '
p
r
une' an
d
'r
e
pack' with 'gc
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
iklos Vajn
a
Update Hungarian translat
i
on
.
10
0
%
completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos
V
aj
n
a
Incl
u
de diff
opt
i
ons in the git
-
log
m
anpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mikl
o
s Vajn
a
git-send
-
em
a
il
:
add
a
new sendema
i
l
.
to
c
o
n
figuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klos
V
ajna
git stash: do
c
ument
a
pply's --index switc
h
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-bundle: fix command
l
ine examp
l
es
i
n
t
h
e manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
klos V
a
jna
Us
e
r Manu
a
l: ad
d
a chapter for subm
o
dules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
M
iklos
Va
j
na
H
u
n
g
arian tran
s
l
ation of
g
it-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
iklos
V
ajna
g
i
tweb:
ne
w
cgi p
a
r
a
meter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
g
itweb: pr
e
fer git_get_pr
o
j
e
c
t_owner() over
g
et_file_owne
r
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mik
l
os Vajna
Do
c
um
e
nt -<n> f
o
r git-format-pa
t
ch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree