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: get rid of virtual_id
2008-09-05
Miklo
s
Vajna
m
erge-re
c
ur
s
ive: get rid
o
f virtual_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos V
a
jna
m
erge-recursive
:
move cur
r
ent_{file,
d
i
r
ectory}_
s
et
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
rge-recursi
v
e: mov
e
the global
obuf
t
o struct merge
_
options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Va
j
na
m
erge-r
e
cu
r
sive: get rid of
the index_only global v
a
riab
l
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recurs
i
ve: move
c
all
_
d
e
pth to struct merge_
o
ptions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajna
cherry-pick/rev
e
r
t:
mak
e
direct in
t
e
rnal cal
l
t
o
me
r
g
e
_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
V
a
j
n
a
builtin-mer
g
e: avoid
r
u
n_command_v_opt() for recursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
e
rge-rec
u
rsive:
int
r
oduc
e
m
e
rge_option
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
Split out me
r
ge_recurs
i
ve() to
merge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
los Vaj
n
a
M
a
kefile
:
en
a
ble SNPRINTF_RE
T
URN
S
_
BOGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
a
j
na
Fix
'
gi
t
help
help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajn
a
t9
3
00
:
replace '!' with test_must_
f
ail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docu
m
entati
o
n: docum
e
n
t
the p
a
ger
.
* configuration setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
o
s
V
a
jna
Builtin git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
M
i
k
l
os Vajna
b
uiltin
-
h
elp:
a
l
w
ay
s
load_command_li
s
t
() in cmd_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
los
V
a
jn
a
Add a second tes
t
c
a
s
e
for handl
i
ng inv
a
l
id strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
Add
a new
t
est for
using a
c
u
sto
m
merg
e
strateg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
builtin-mer
g
e: a
l
low using a custom strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajn
a
built
i
n-help: make
some
i
nternal funct
i
ons
available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t
760
1
:
extend the '
m
erge picks up the be
s
t
r
esult'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-
m
erge: gi
v
e a proper error me
s
sage for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos Vajna
Te
a
ch 'git merge' th
a
t so
m
e mer
g
e strat
e
gies no long
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
V
ajna
Add a new test for git-merg
e
-
resol
v
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s Vajn
a
t6021
:
add a
new test fo
r
git-merge
-
resolv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
make remo
v
e-dashes: apply
t
o scripts and
p
rograms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los V
a
jna
g
it-
b
isect:
use dash-less f
o
rm on g
i
t
b
i
s
ect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
t1007-hash-object
.
sh: use quotes for the test
d
es
c
r
ipt
i
on
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
n
a
t
0
00
1
-init
.
sh: change confusing director
y
n
a
me
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mikl
o
s Vajna
Bu
i
ld
i
n merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fi
x
t7601-merge-pull-co
n
fig
.
s
h on
A
I
X
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
g
it-commit-tree:
m
ake it usable from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Ad
d
n
e
w te
s
t case
t
o ensure g
i
t-merge prepends t
h
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajna
hg-
t
o-git: us
e
g
it init instead
o
f git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-
t
o-git: rewrite "git-
f
rotz"
t
o "git frotz
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-git: ab
o
rt if the
p
roject directo
r
y is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vaj
n
a
hg-to-
g
it:
a
v
oid rai
s
ing a string
e
xcep
t
ion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
IN
S
TALL: Update section about git
-
f
rotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire 'stupid' merg
e
s
trat
e
gy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajn
a
A
dd
ne
w
t
e
s
t
c
ase
to
e
nsure git-merge r
e
d
uces oct
o
pus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test
t
o ensure git-merge h
a
ndles mo
r
e than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
In
t
roduce get_oc
t
opus_merge
_
bases
(
)
in co
m
mi
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
gi
t
-fmt-m
e
rge-msg: make
it usable
f
rom other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move r
e
ad_c
a
che_unmerged() to
read-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Add new test to
ensure git-merge handles pull
.
t
wo
h
ea
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-options's ski
p
_
p
refix() to git-compat
-
util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_list_
c
ount()
t
o commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Move split
_
c
m
d
l
i
ne() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
path-l
i
st docume
n
tati
o
n: document all functions
a
nd
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command
d
ocumen
t
ati
o
n: fi
x
"m
e
m
se
t
()" par
a
met
e
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tree: document -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple scri
p
t to pa
r
se
t
he results from the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase
-
i: me
n
tion the sh
o
rt c
o
mma
n
d
alias
e
s
in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
kl
o
s Va
j
na
Remove
u
nused code in parse_commit
_
buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
M
i
kl
o
s
V
ajna
Strbu
f
docu
m
entati
o
n: d
o
cument most function
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s Vajna
Rev
i
sion walking do
c
umentati
o
n: document mos
t
importan
t
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s Vajna
Codin
g
Guidelines: Add a
n
ote to avoid
a
ssignments inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mik
l
o
s
V
a
jna
git-merge: exclude
unnecessary options from OPTIO
N
S_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
M
i
k
l
os Vajna
git-fas
t
-
i
mpor
t
: rename cmd_*() f
u
n
c
tions to
p
arse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajn
a
INSTALL: add a note
a
bo
u
t GNU in
t
eractive tool
s
has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
V
a
j
na
A
d
d
tests
f
o
r
s
e
ndemail
.
c
c
c
onfigur
a
t
i
on variab
l
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-send-e
m
a
il: add a new sendemail
.
cc
c
onfiguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Va
j
na
git-form
a
t-patch: add a
n
ew form
a
t
.
cc configu
r
ation
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Mik
l
os
V
ajna
git
checkout:
add -t alias for --trac
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mikl
o
s Vajna
d
iff opt
i
ons d
o
cume
n
tation: refer t
o
--
d
iff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
aj
n
a
co
n
tr
i
b/h
o
oks:
a
dd an example pre-auto-gc h
o
ok
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation/ho
o
ks: a
d
d pre-auto-
g
c hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
g
i
t-gc --a
u
to: ad
d
pre-auto-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mik
l
os Vajna
Documentation/git-m
e
rg
e
: document subtre
e
stra
t
egy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
M
i
klos V
a
jna
g
i
t-gui: Upda
t
ed H
u
ngarian t
r
anslation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Up
d
ate
H
u
n
ga
r
i
a
n
t
r
ansla
t
ion
.
100% comple
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
Mik
l
os Vajn
a
Improve t6029
to ch
e
ck
t
h
e real "sub
t
r
e
e" ca
s
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vaj
n
a
Document
a
tio
n
/git svn lo
g
: add a note about timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s Vajna
Documentat
i
on/git
-
filter-br
a
nch: add a n
e
w msg-f
i
lt
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-cle
a
n: han
d
le errors if removi
n
g fi
l
es fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
D
o
c
umentation/g
i
t-stash: document options fo
r
git
s
tash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s Vaj
n
a
gi
t
cl
o
n
e
-s docume
n
ta
t
io
n
: force a new paragraph fo
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin-gc
.
c: guar
d
conf
i
g
parser from val
u
e=NU
L
L
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
a
jna
git
r
ev-parse m
a
npage: spelling
f
ix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
M
iklos Vajna
git
p
ull ma
n
p
age: don't inclu
d
e -
n
f
r
om fet
c
h
-
options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
M
i
kl
o
s Vajna
g
it-clone -s: do
c
ument pr
o
blems
w
i
t
h git gc
--prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Includ
e
r
e
v-list options i
n
git-log
m
a
npage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos V
a
j
na
l
s-remo
t
e: add
-t and -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vaj
n
a
Add
u
s
ing merge subtr
e
e How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Mik
l
os Vajna
t/t7001: avoid
unnecessary ER
E
when
u
sing
g
r
ep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-s
e
tup
:
document git_editor()
and
g
et_a
u
thor_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
M
i
klos Vaj
n
a
everyday: replace
'prune' and
'repack
'
wit
h
'
g
c'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os Vajn
a
Update Hungaria
n
translation
.
1
00% completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
Vajna
Include d
i
ff
o
ptions in the git-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klos
V
ajna
git-s
e
nd-email: add a n
e
w se
n
demail
.
to configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklo
s
Vajna
git stash: docume
n
t apply's --
i
ndex switch
commit
|
commitdiff
|
tree
2007-09-29
Miklo
s
V
a
jna
gi
t
-bundle: f
i
x comma
n
dline
examples in the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklo
s
V
a
jna
User
M
anual: add a
chap
t
er
f
or sub
m
o
d
u
l
es
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Mik
l
o
s
V
a
jna
Hungar
i
an
translation of git-
g
ui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
M
iklos V
a
jna
gitweb: new c
g
i
parameter: op
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
M
iklos Vajna
gitweb: prefer git_get_proje
c
t_owner(
)
o
v
e
r get_file_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos V
a
jna
D
ocument -<n> for git
-
format-
p
a
t
c
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree