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
merge-recursive: move the global obuf to struct merge_options
2008-09-05
Miklos Va
j
na
merge-r
e
cursive: move the
g
lobal obuf to struct merge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merg
e
-rec
u
rsiv
e
:
get rid of the index_only global variab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mikl
o
s Vajna
merge-recursive: move call_depth t
o
str
u
ct m
e
r
ge_opti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klo
s
Vajna
cherr
y
-pick/rever
t
: make di
r
ect internal call to merge_
t
r
ee(
)
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
l
os Vajna
builtin-merge: avoid run_comman
d
_v_opt() f
o
r rec
u
rsiv
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
m
erge-
r
ecursive: introduce
m
e
rge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out merge_recur
s
i
ve
(
) t
o
mer
g
e-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
M
a
kefile: e
n
able SNPRINT
F
_RETU
R
NS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
F
i
x
'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
iklo
s
Vajna
t9300: replace '!' with tes
t
_m
u
s
t
_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentat
i
on: document the pager
.
* configurati
o
n set
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s V
a
jna
Builtin
g
i
t-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklo
s
Vajn
a
builtin
-
help: always load
_
command_
l
ist() in
c
md_
h
elp()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jn
a
A
d
d
a second testcase for
h
a
ndling invalid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d
a
new
t
est for u
s
i
ng
a
custom merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
o
s Vajna
bu
i
l
tin-merge: allow us
i
n
g
a
c
u
stom s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
buil
t
in-hel
p
: mak
e
s
o
me inte
r
nal functions a
v
ailable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
a
j
na
t7601: extend
t
he 'merge picks up the b
e
s
t
r
e
s
u
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builti
n
-merge: give a p
r
oper error message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos
Vajna
Teac
h
'git merge' tha
t
som
e
merge
s
trategies no
l
onger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajna
Add a n
e
w
t
est for gi
t
-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add
a
n
ew test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make r
e
move-dashes: a
p
ply to
scri
p
t
s and pr
o
grams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
git-bise
c
t: use
d
as
h
-
l
ess
f
orm on git bis
e
c
t
l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
n
a
t1007-hash-object
.
sh
:
use q
u
otes for th
e
test descriptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
t0001-init
.
sh:
change confusi
n
g direct
o
ry name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los V
a
jna
Build in m
e
rge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
Fix t7601-merge-pull
-
config
.
sh on
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
i
t-commi
t
-tre
e
:
make it usable
from other built
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajn
a
Add new tes
t
case to ensur
e
git-
m
erg
e
pre
p
ends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klo
s
Vajna
hg-to-git: use git init instead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
j
n
a
hg-t
o
-git: rewrite "
g
it-frotz" to
"
git
f
rotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to-git: ab
o
rt
i
f th
e
project
direc
t
o
ry is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
V
ajna
hg-to-
g
it: avoid raising a strin
g
excepti
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los V
a
j
n
a
IN
S
TALL: Update section
about git-frot
z
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire '
s
tupid' mer
g
e strateg
y
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
Vajna
Ad
d
new test ca
s
e to ensu
r
e git-merge reduces
octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
Vajna
Add new test
t
o ensure
g
i
t
-m
e
r
g
e handles mor
e
tha
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Introduce get_octopus_merge_
b
ases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
git-fmt-
m
e
rge-msg: ma
k
e
i
t
usable fr
o
m o
t
her bu
i
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os
V
ajn
a
Move
r
e
a
d_cac
h
e_u
n
merged() to read-ca
c
he
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
V
ajna
Add new t
e
s
t to ensure
git-merge ha
n
dles p
u
ll
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-options's sk
i
p
_
prefix() to g
i
t-
c
ompat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
ik
l
os Vajna
Mo
v
e c
o
mmit_list_count() to
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Va
j
na
Move split
_
cmdline() to al
i
as
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vajna
path-
l
ist
d
ocumentation:
document all functi
o
ns
a
nd
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-comman
d
do
c
umentation: fi
x
"me
m
set()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklo
s
Vajna
git-read-tree: document
-
v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos V
a
jna
A
sim
p
le sc
r
ip
t
to
parse
the
r
es
u
lts from the
testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
j
na
g
i
t-r
e
base -i: mentio
n
the sho
r
t
c
o
m
m
a
n
d
aliases i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Vajna
Remove unused code
i
n
p
arse_comm
i
t
_
b
uf
f
er(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
i
klo
s
Vajna
Strb
u
f documenta
t
ion: d
o
cument most fun
c
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajn
a
R
evi
s
ion walking
d
ocument
a
tion: documen
t
most
i
mp
o
r
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los Va
j
na
C
o
d
ingGuide
l
ine
s
: Add a note to avoi
d
a
ssi
g
nme
n
ts
i
nside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
iklos Vajna
gi
t
-merge: exclude
u
nnecessary op
t
io
n
s f
r
om OP
T
IONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mik
l
os Vajn
a
git
-
fast-i
m
p
o
rt: rename cmd_*() functions to pa
r
s
e_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklo
s
Vajn
a
INS
T
ALL:
add a
n
ote
abou
t
GNU in
t
eractive t
o
o
l
s
h
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos
V
ajn
a
Add tests for se
n
demail
.
cc conf
i
guration variabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Va
j
na
git-send
-
email: add a new
sendemail
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klo
s
V
a
j
na
git-format-p
a
tch
:
a
d
d
a
n
ew format
.
cc co
n
figur
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Va
j
na
git
c
heckout: a
d
d -t
a
l
i
as for -
-
tr
a
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
dif
f
o
p
ti
o
ns doc
u
m
entation: refer to --diff
-
filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
contrib/hook
s
: add an e
x
a
mple pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Docu
m
entation/hook
s
:
a
dd pre-auto-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc --a
u
t
o
: add p
r
e-auto
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos
V
ajna
Documentation/git-
m
e
r
ge: document subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
o
s
V
ajna
git-gui: Upda
t
e
d
Hungarian tran
s
lation (e5fba
1
8)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hung
a
rian trans
l
ation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajn
a
I
m
prove t6029 to check the
r
eal "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklo
s
Vajna
Docume
n
tation/git svn l
o
g:
add a
n
o
te
about ti
m
e
z
ones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mik
l
os Va
j
na
Doc
u
ment
a
t
i
on/git-f
i
lte
r
-bran
c
h: add a new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vaj
n
a
gi
t
-
cl
e
an:
h
and
l
e errors
if removing files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mikl
o
s
V
ajna
Documentation/git-stash: doc
u
m
ent
options for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mi
k
los Vajn
a
g
it clone -s documenta
t
ion: for
c
e a new parag
r
aph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos
Vaj
n
a
buil
t
in-gc
.
c: gua
r
d config parser from
value=N
U
LL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git re
v
-par
s
e manpag
e
: sp
e
lling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull manpa
g
e: don't include -n f
r
o
m fetch-options
.
t
xt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
gi
t
-clone -s: document problems with git gc --pru
n
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mik
l
os Va
j
n
a
In
c
lude rev-list options i
n
gi
t
-l
o
g m
a
n
page
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos Vajna
ls-remo
t
e: ad
d
-t and
-
h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos
Va
j
na
Add
u
sing m
e
rge su
b
tree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t
/t7001:
a
v
oid unn
e
cessary ERE
whe
n
usi
n
g
grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
M
i
klo
s
Vajna
git-sh
-
setup:
d
o
cument g
i
t_editor() a
n
d get_author_ident_
f
ro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
los Vajna
everyday: replace 'prune' an
d
'
r
e
pack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian tran
s
lation
.
100% co
m
pleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklo
s
Vajn
a
Inclu
d
e diff options
in th
e
git
-
log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klos Vajna
git-se
n
d
-
email:
add a new sendemail
.
to
configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klos Vajn
a
g
i
t stash: document a
p
ply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos
V
ajna
gi
t
-b
u
n
d
le:
fix comma
n
dline example
s
in the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Mik
l
os Vajna
User Manual: a
d
d a chapter
f
or submod
u
l
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
Vajna
Hungarian
tra
n
slation of git-gu
i
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
i
klos
Vajna
g
itweb: new cgi param
e
te
r
: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos
Va
j
na
git
w
eb: prefer g
i
t_get_project
_
owner
(
) over ge
t
_file_owne
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mi
k
lo
s
Va
j
na
Document -<n> for gi
t
-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree