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
Mik
l
os Vajna
m
e
rge-recursi
v
e
:
move the globa
l
o
buf to struct me
r
g
e_opt
i
ons
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-r
e
cursive: get rid of the index_
o
nly global variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklo
s
Vaj
n
a
m
erge-recursive:
m
o
ve call_dept
h
to struct merge_
o
ptions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
che
r
ry-pick
/
revert:
make direc
t
int
e
rnal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
builtin-merge: avoid ru
n
_comman
d
_
v
_opt() for r
e
cursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
erge
-
re
c
ursive: introduce merge
_
option
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out merge_recu
r
sive() to mer
g
e-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
los Vajna
Makefile: enable SNPRINTF_RETU
R
NS_BOGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
M
i
klos Vajna
Fix
'git he
l
p help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Mikl
o
s Vajna
t9300
:
replac
e
'!'
with
test_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
o
s
V
ajna
Documentation: document the pag
e
r
.
* config
u
ra
t
ion sett
i
n
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
M
ik
l
os Vajna
Bui
l
t
in
git
-
hel
p
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Mikl
o
s Vajn
a
bu
i
lti
n
-help:
a
lways loa
d
_com
m
and_list
(
) in cmd
_
help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vaj
n
a
A
dd a second te
s
tcase for handling invalid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos V
a
jna
Add a new t
e
st for using a c
u
stom merg
e
st
r
ategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builti
n
-merge: allow using a custom strat
e
g
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
buil
t
i
n-help:
m
ake some internal func
t
ion
s
availa
b
le
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mik
l
os Vajna
t7601: extend the
'merge pi
c
ks u
p
th
e
best
result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merg
e
:
g
i
ve a proper error
message fo
r
i
nvalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vajna
Teach 'git merge' that some merge
s
tr
a
tegies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a ne
w
t
est f
o
r
g
it-
m
erge-reso
l
ve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a ne
w
test for git-m
e
rge-resolv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
mak
e
remove-dashes: a
p
ply to scripts
a
n
d programs
as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
o
s
Vaj
n
a
git-bi
s
ect: use d
a
sh-les
s
form on git bi
s
ec
t
lo
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash
-
object
.
s
h
: use
q
uotes for the
te
s
t
d
escr
i
ption
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t
00
0
1-init
.
sh: change confusing directory
na
m
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
i
kl
o
s
Va
j
n
a
B
ui
l
d in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
Fix t7601-me
r
ge-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Va
j
na
git-co
m
mit-tree: make it
us
a
ble
f
rom other bu
i
ltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test case to
e
nsure gi
t
-me
r
ge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to-git: use git init instea
d
of git i
n
it-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: r
e
wri
t
e "git-frotz"
t
o
"git
f
rotz"
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 project directory is not
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git: avoid raising a stri
n
g
exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTA
L
L: Update section about
g
it-fr
o
tz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
V
ajna
R
e
tire 'stu
p
id'
merge st
r
ategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add new test c
a
s
e to
ensure git
-
merge re
d
uces
o
ctopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test to e
n
s
ure gi
t
-merge handles mo
r
e than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
lo
s
Vaj
n
a
Introdu
c
e get_
o
ctopus_merge_bas
e
s() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
git-fmt-merge-msg: make it usab
l
e from other bu
i
l
t
ins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Mov
e
r
e
ad_
c
ache_u
n
m
e
rge
d
() to r
e
ad-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajn
a
Ad
d
new test to ensure git
-
merge handles pu
l
l
.
t
w
ohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move pars
e
-option
s
's
s
kip_prefix(
)
to git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Move commit_
l
ist_count() t
o
comm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_
c
mdline() to a
l
ias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklo
s
Vajna
path
-
l
ist document
a
ti
o
n: document all function
s
and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-c
o
mmand doc
u
m
enta
t
ion: fix "memset()
"
parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
M
iklos Vajna
g
i
t-re
a
d-tree: document -
v
o
p
tion
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A s
i
mple
scrip
t
t
o
p
a
rse th
e
results from the te
s
t
c
ase
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
V
a
jna
g
i
t
-
rebase -i: mention the short comman
d
aliases
in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
R
em
o
ve
u
nu
s
ed c
o
de in
p
arse
_
co
m
mit_
b
uff
e
r()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
V
ajna
Strbuf d
o
cume
n
tatio
n
: d
o
cument
m
ost functi
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
M
i
kl
o
s Vajna
R
evision
w
alking
documentation
:
docu
m
ent most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
V
aj
n
a
CodingGu
i
delines: A
d
d a not
e
to avoid assig
n
ments in
s
ide
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mik
l
os
V
ajna
git-merge: ex
c
lu
d
e unnecessary options from OPT
I
ONS_SP
E
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s Vajna
git-fast-imp
o
rt: rename cmd
_
*(
)
functio
n
s to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajn
a
I
N
S
TALL: add a n
o
te
a
bout
GNU interactive tools h
a
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
Add tests for send
e
mail
.
cc con
f
iguration va
r
i
able
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Vaj
n
a
git-se
n
d-email: add
a
new
s
e
n
demai
l
.
cc c
o
nfiguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
los Vajna
git-form
a
t-patch:
add a new format
.
cc config
u
ration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos V
a
jna
git checkout: a
d
d -t
a
l
ias for --tra
c
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
l
os Vajna
diff options documentation: ref
e
r to --diff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
contrib/hooks: add an example
p
re-
a
u
t
o-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation/hooks:
a
dd pre-auto
-
g
c
h
o
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vaj
n
a
git-gc --auto: add
pre-auto
-
gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klos Vajna
Documentat
i
on/git-merge: document
s
ubtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
i
t-gui: Updated
H
ungarian t
r
anslation (e5fba
1
8)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
U
p
date Hungar
i
an transla
t
io
n
.
100% complete
d
.
commit
|
commitdiff
|
tree
2008-02-29
M
i
klos
V
ajna
I
m
prove t
6
029
to ch
e
ck
t
he re
a
l "subtre
e
"
c
ase
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Documentation/
g
it
svn l
o
g: add
a note abo
u
t t
i
mezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mik
l
os V
a
jn
a
Documen
t
ation/git-f
i
lter-b
r
a
n
ch: ad
d
a
n
ew msg-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Mik
l
o
s
Vajna
git-clean
:
ha
n
dle errors if removing file
s
fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Documentation/git-stash: document options for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
Va
j
na
git clone -s d
o
cumentation
:
f
orce a
n
ew para
g
raph
f
or
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin-gc
.
c: g
u
ard config parser from
v
alue=N
U
L
L
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
os Vajna
git re
v
-parse ma
n
page: spell
i
ng
f
ix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
los Vajna
git
pu
l
l manpage: don't incl
u
de -n fro
m
fetch-
o
ption
s
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
V
ajna
git-clone
-s: docum
e
n
t
pr
o
blem
s
with git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Mi
k
los
V
ajn
a
I
n
c
l
u
de rev-lis
t
options in gi
t
-
log m
a
npa
g
e
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote:
a
d
d
-t and -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add using merge subtree
How-T
o
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001: avoid unneces
s
ary
ERE when usin
g
grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-s
h
-set
u
p:
d
ocumen
t
git_edi
t
or(
)
and get_author_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
M
ik
l
o
s
Vajn
a
everyday: replace 'prune' and '
r
epack'
w
ith 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
Vajna
Up
d
ate Hungarian tran
s
lat
i
on
.
100% c
o
mpleted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos V
a
j
na
Inc
l
ude di
f
f opt
i
ons in the git-log manpag
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Va
j
na
g
it-send-ema
i
l:
add a ne
w
s
endemail
.
to co
n
figuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Mikl
o
s Vajn
a
git stash: d
o
cument apply's --index
switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
g
it-bundle: f
i
x com
m
andline examp
l
es i
n
the
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
Vajna
User M
a
nual: add
a c
h
apter for submodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Mikl
o
s Vajna
Hung
a
rian tra
n
sl
a
t
i
on of
git-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos
Vajna
gitweb:
n
ew cgi parameter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
os Vajna
g
i
t
w
e
b
: prefer git_g
e
t_project_owner() ove
r
ge
t
_file_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Mikl
o
s Vajna
Document -<n
>
f
o
r git-forma
t
-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree