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
klo
s
Vajna
t7601
:
extend the 'merge pic
k
s up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mi
k
l
os Vajn
a
builtin-merge: g
i
ve a proper erro
r
message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
Vajna
Teac
h
'gi
t
merge'
that
s
ome m
e
r
ge strate
g
i
e
s no
l
onger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajn
a
Add a new test for
g
it-mer
g
e-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
t6021: ad
d
a new te
s
t for
g
it-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-
d
as
h
es: apply to scripts and prog
r
ams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bi
s
ect: use d
a
s
h-less form on git bisect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
1
007-
h
ash-obj
e
c
t
.
sh: use quotes for
the t
e
st des
c
r
i
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t0001-init
.
sh: c
h
ange con
f
using direct
o
ry nam
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
o
s Vaj
n
a
Bu
i
ld in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
Fix t7601-merge-pull-
c
on
f
ig
.
sh o
n
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
git-commi
t
-
t
ree: make it
u
sable
f
rom ot
h
er builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
l
os V
a
jna
A
d
d
n
ew
t
est case to ensure git
-
mer
g
e prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-git: us
e
git ini
t
instead of git init-d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
t
o-g
i
t:
rewrite "
g
it-frotz" to "
g
it
fro
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-t
o
-git: abort if the
pr
o
ject directo
r
y is
n
ot a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-git: avoid ra
i
sing a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
INST
A
LL: Update section
about git-f
r
otz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Va
j
na
R
e
tir
e
's
t
upid' me
r
ge s
t
r
at
e
gy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case
to ens
u
re git-mer
g
e
reduc
e
s octopu
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d
n
ew test to
e
nsu
r
e git-merge
h
andles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_octo
p
us_
m
erge_b
a
s
es() i
n
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git
-
fmt-m
e
rge-msg: make i
t
us
a
ble fro
m
oth
e
r b
u
ilt
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los V
a
jn
a
Move read_cache_un
m
erged() to rea
d
-
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
g
it-merge
handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos V
a
jna
Move pa
r
se-options's
s
kip_prefi
x
() t
o
git-
c
o
m
pat
-
util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move comm
i
t
_
list_co
u
nt() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split
_
c
m
dline() to alia
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Vajna
path-list documen
t
ation: document all functions
a
nd
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
kl
o
s V
a
jna
run-command doc
u
mentation: fix "memset(
)
" paramete
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos V
a
jna
gi
t
-
r
ead-tree: document -v o
p
tio
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
A
s
i
m
ple script to
parse the re
s
u
lts from the testcase
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s V
a
jna
git-re
b
ase
-i:
m
enti
o
n the s
h
ort co
m
mand aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remo
v
e unused code
i
n p
a
rs
e
_commit_buf
f
e
r(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos V
a
jna
Str
b
u
f
doc
u
mentation: document most fu
n
ctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
R
ev
i
sion walking documentation: document
m
ost impo
r
tant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
Co
d
ingGui
d
elin
e
s: Add
a
note to avoid assi
g
nments
i
nside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklo
s
Vaj
n
a
git
-
merg
e
: exclude unnecessary options from OPT
I
ONS_
S
PEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
k
l
os
V
ajna
git-fast-import: rename cmd_*()
functio
n
s to pars
e
_*
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL:
add
a
no
t
e abo
u
t
G
NU
interact
i
ve tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Vajna
Add test
s
for
s
endemail
.
cc
c
onfigurat
i
on
v
aria
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajna
gi
t
-send-email: add
a new sendemail
.
cc con
f
iguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-for
m
at-patch:
a
dd a new
f
o
rmat
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos
V
ajna
git checkout: add
-
t alias
f
o
r
-
-
t
r
ack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
d
i
ff options
documentation: re
f
er to -
-
d
i
ff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vaj
n
a
cont
r
ib/h
o
oks:
add
a
n example p
r
e-auto
-
gc ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Docume
n
t
a
tion/
h
oo
k
s
:
add
pre-auto-gc
h
oo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos V
a
jna
git-gc
--auto: add pre-auto-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentation/git-merge: document subtree str
a
tegy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
ikl
o
s Vaj
n
a
g
i
t-
g
ui: Updated Hung
a
rian
translat
i
on (e5fb
a
18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
los Vajna
U
p
d
a
te Hungar
i
an tr
a
nslat
i
on
.
10
0
% complete
d
.
commit
|
commitdiff
|
tree
2008-02-29
M
iklos Vajna
Improve t6029 to check the
real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Doc
u
mentation/git svn
l
og: ad
d
a
n
o
te a
b
out
time
z
o
nes
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos Vajna
Documentation/git-
f
i
l
t
er-
b
ranch:
add
a
new msg-
f
ilter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git
-
clea
n
: handle errors if removing files fail
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Vajna
Do
c
umentati
o
n/git-stash: documen
t
o
p
t
ions for git
stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos V
a
jna
git clone -s documentation: force a new paragra
p
h for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajn
a
bu
i
l
tin-gc
.
c: guar
d
config parser from value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Va
j
na
git r
e
v-pa
r
se
m
anpage: spelling
f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
los Vajna
git pu
l
l manpag
e
: d
o
n't
include -n fr
o
m fetch-options
.
tx
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-c
l
one -s:
d
ocument problems wit
h
git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Includ
e
rev-list o
p
tions in git-log ma
n
page
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos
V
ajna
ls-
r
emo
t
e: add -t
a
nd -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add
u
s
i
n
g
merge subtree Ho
w
-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001: avoi
d
unnece
s
sary ER
E
when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajn
a
git
-
s
h-setup: docu
m
ent git
_
edi
t
or() an
d
get_author_ident_
f
ro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Va
j
na
eve
r
yday
:
re
p
lace 'prune'
and
'
repa
c
k' wi
t
h 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
Update Hungarian transla
t
i
on
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
los Vajna
Include diff
o
p
tion
s
in the git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mi
k
los
Vajn
a
git-send-
e
m
a
i
l: add a new sen
d
email
.
to configuratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash:
d
ocumen
t
apply's --index
sw
i
tch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Va
j
na
git
-
bundle: fix commandli
n
e examples in th
e
man
p
ag
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
klos
Va
j
na
U
s
e
r Manu
a
l: add a
c
ha
p
ter for su
b
modules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklo
s
Vajna
H
u
ngarian tra
n
slation
of
g
i
t-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mikl
o
s Vajna
gitweb: new cgi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: p
r
efer git_
g
e
t
_project_owner(
)
over get_fil
e
_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
M
iklos Vajna
D
o
cument
-
<n>
f
o
r
g
i
t-f
o
rm
a
t-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree