repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: get rid of virtual_id
2008-09-05
Miklos Vajna
m
er
g
e-r
e
cursive
:
get
r
i
d
of v
i
r
t
u
a
l_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-rec
u
rsive: move current_{file,directory}_s
e
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos
Vaj
n
a
merge-recursive: mo
v
e the glo
b
al obuf to str
u
ct
merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
ajna
merge-recursive: get rid of
t
he i
n
dex_only gl
o
bal variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos
V
ajna
mer
g
e
-recursi
v
e: move
c
a
l
l_depth to struct me
r
g
e
_
opt
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
k
los Vaj
n
a
cherry-pick
/
revert: make
d
irect in
t
ernal cal
l
to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: avo
i
d run_co
m
man
d
_v_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vaj
n
a
merge-recu
r
sive: introduce merge
_
options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vaj
n
a
Sp
l
it out m
e
rge_recursive() to merge-recursiv
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Vajna
Makefile: e
n
a
b
le SNPRINT
F
_RETU
R
NS_BOGUS fo
r
H
P
-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
los Vajna
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: replace '!
'
w
i
th te
s
t_m
u
st_
f
a
il
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
V
ajna
D
o
c
u
m
entation:
d
oc
u
ment the pager
.
* configurat
i
on setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
Vajna
Builtin gi
t
-h
e
lp
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Va
j
na
b
u
ilt
i
n
-
h
elp:
always load_comm
a
nd_list() in cmd_he
l
p()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
Add a
s
ec
o
nd
testcase
f
o
r handling
i
nv
a
lid strategi
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
n
a
Ad
d
a new
test for us
i
ng a
custom merge
s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
builtin-m
e
rge:
allow using a cust
o
m
strate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
V
ajna
bu
i
ltin-
h
elp: make
some i
n
ternal functi
o
ns avai
l
ab
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vaj
n
a
t76
0
1:
e
xten
d
the 'merge
p
i
c
ks up
the
be
s
t
r
esu
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
V
ajna
b
uiltin-merge:
give a proper error message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
T
each 'git m
e
rge
'
that some merge strategies
n
o longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
A
d
d a new test fo
r
git-merge-res
o
l
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos V
a
jna
t6021: add a new test
for git-merge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
make remove-dashes: app
l
y to scripts an
d
p
r
ograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
i
t-bisect: use
d
ash-less form o
n
git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos V
a
jna
t
1007-ha
s
h-object
.
sh: use quotes
f
or
t
he test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
t0
0
0
1
-
init
.
sh:
c
h
ange
c
onf
u
sing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
o
s
Vajna
Build in me
r
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix
t7601-merge
-
pull
-
config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
git-comm
i
t-tree: make it usable fr
o
m
other bui
l
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
Add new test case to ensur
e
g
it-mer
g
e
p
repends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
ajna
hg-to-git: u
s
e git
i
n
it inste
a
d of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
n
a
hg-
t
o-git: re
w
rit
e
"git-frotz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajn
a
hg-to
-
g
i
t
: abort if the project directory
is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
a
jn
a
hg-
t
o-g
i
t: avoid r
a
isin
g
a
s
trin
g
exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vaj
n
a
INSTALL
:
Update se
c
tion
a
b
o
ut
g
it-frotz
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Re
t
ire '
s
tupid'
m
erge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d n
e
w
t
est case to ensur
e
git-merge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajn
a
Add
new tes
t
to ensure g
i
t-merge handles more t
h
an
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Introduce ge
t
_o
c
topus_mer
g
e_bases() i
n
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s Vajna
git-fmt-me
r
ge-msg: make it
u
sable
f
r
om o
t
her builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_c
a
ch
e
_
u
n
merge
d
() to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
Add ne
w
test
to ensure
g
it-me
r
g
e
ha
n
dles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse
-
options's skip_prefix()
t
o git-co
m
p
a
t-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
V
ajna
M
o
ve comm
i
t_list_count() to commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Move split_c
m
dline()
to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
pa
t
h-list doc
u
mentation: document all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
l
os Vajna
run-co
m
mand
d
ocumentation: fix "memset(
)
" pa
r
ameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
gi
t
-read-
t
ree: document
-v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
o
s
Vaj
n
a
A simple script to
par
s
e the results fro
m
t
he t
e
stcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Va
j
na
gi
t
-
r
e
b
ase
-i: mentio
n
the s
h
ort comman
d
aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
Rem
o
ve unused code in parse_commit_buff
e
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos V
a
jna
Str
b
uf document
a
t
io
n
:
d
o
c
u
men
t
most functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
ikl
o
s Vajna
Revisi
o
n walking documentation: documen
t
most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los V
a
j
n
a
Co
d
i
ngGui
d
elines: Add a
note to avoid assi
g
nmen
t
s insi
d
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
los Vajna
git-merg
e
: exclude u
n
necessa
r
y option
s
from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
iklos Vajna
g
i
t-
f
ast-
i
m
port: rename
cmd_*()
functions to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
M
i
klos Vajna
INSTALL: add
a no
t
e
about GN
U
i
nterac
t
ive t
o
ols
h
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
A
dd tes
t
s for sendemail
.
cc
config
u
rati
o
n
v
ari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
los Vajna
git-send-email: add a new
s
endemail
.
cc con
f
iguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-for
m
a
t-patch
:
a
d
d
a
new form
a
t
.
c
c
c
onfiguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Va
j
na
g
i
t che
c
k
o
ut: add -t a
l
ias for
-
-track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
V
ajna
diff optio
n
s
documentati
o
n: refer to -
-
diff-fil
t
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/h
o
oks: a
d
d an
exampl
e
pr
e
-auto-g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
Docum
e
n
t
ation/ho
o
ks
:
add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
g
it-gc --auto: add
p
r
e-
a
ut
o
-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos
V
ajna
Documentation/git-merg
e
:
d
ocument subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Updated Hungar
i
an tran
s
latio
n
(e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hungarian translation
.
10
0
% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
I
m
pro
v
e
t60
2
9 t
o
check the real "subtree
"
case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Mi
k
los Va
j
na
Document
a
tion/git svn log: a
d
d a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklo
s
V
ajna
Doc
u
m
en
t
a
t
io
n
/git-filter-bra
n
ch:
add a ne
w
msg-filt
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklo
s
V
ajna
git-clean: handle errors
i
f removi
n
g files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos V
a
j
n
a
Documentati
o
n/gi
t
-stash: docume
n
t options for git sta
s
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
gi
t
c
l
one -
s
docum
e
ntation: for
c
e a
n
e
w
p
aragraph
f
or
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
bu
i
ltin-gc
.
c: guard con
f
ig pars
e
r f
r
om value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Va
j
na
git rev-par
s
e
manpage: s
p
e
lling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git p
u
ll m
a
np
a
g
e:
d
o
n't include
-
n fro
m
fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Mikl
o
s Vajn
a
g
it
-
clone
-s: document problems w
i
th git
gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
i
k
l
os
V
ajna
Includ
e
rev-list options in git-
l
og manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vaj
n
a
ls-remote: add -t and -h optio
n
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mi
k
los
Vajna
Add usi
n
g merge subtr
e
e How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7
0
01: avo
i
d unnecessa
r
y
E
R
E
whe
n
u
s
ing
grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
g
i
t
-sh
-
setup: documen
t
git_edito
r
() and get_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
e
v
e
ryday: replac
e
'prune' and 'rep
a
ck' with
'
gc
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update H
u
n
g
a
r
i
an
translation
.
100% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Vaj
n
a
Include diff option
s
in the
g
it-lo
g
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
iklos Vajna
git-
s
end
-
em
a
il: ad
d
a new
s
en
d
email
.
to config
u
r
ation
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklo
s
Vajna
git stas
h
: document ap
p
ly's --index swit
c
h
commit
|
commitdiff
|
tree
2007-09-29
Mik
l
os Vajna
git-bundle
:
fix c
o
mmandline exam
p
les
in th
e
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vaj
n
a
User Ma
n
u
a
l: add a ch
a
p
t
er for submodule
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian
t
rans
l
a
t
i
o
n
o
f
gi
t
-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gitweb: new cgi
parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
os Vajna
g
itweb: p
r
e
fer gi
t
_g
e
t_project_owner() over g
e
t
_
fi
l
e_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
D
o
c
u
m
ent -<n> for
g
it-forma
t
-
p
at
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree