repo.or.cz
/
git
/
vmiklos.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
Miklo
s
Vajna
merge-re
c
ursive: move
t
he global
o
buf to s
t
r
u
ct m
e
rge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
ik
l
os Vaj
n
a
merge-recu
r
siv
e
: get rid of
the
i
n
d
e
x_only g
l
ob
a
l variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos V
a
j
n
a
merge-re
c
ursive: mo
v
e call_depth to struct merge_optio
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
c
herry-pick/revert: make di
r
ect internal ca
l
l t
o
merge_tr
e
e
()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge:
avoid run_c
o
mm
a
nd_v_opt() for recurs
i
v
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
erge-recursive: introduce me
r
g
e_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split ou
t
merge_rec
u
rsive() to mer
g
e-recursi
v
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makef
i
le: enable
SNPRINTF_
R
ETURNS_BOGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos Vajna
Fix
'git he
l
p help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Va
j
n
a
t93
0
0: replace '!' with test
_
must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Va
j
na
Documentation: document
the pager
.
* configurati
o
n sett
i
n
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Built
i
n git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
M
ik
l
o
s
Vajna
b
u
il
t
in-help: always l
o
ad_c
o
mman
d
_
l
i
st() i
n
cmd_he
l
p()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
Add a seco
n
d test
c
ase for han
d
ling
i
nvalid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os
Vajna
Add a
new test for using a custom merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
builtin
-
merge: allow usin
g
a custom stra
t
eg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
b
uilt
i
n-hel
p
: make some
i
nter
n
al function
s
available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
Vajna
t7601: exten
d
the 'merge picks up th
e
bes
t
r
e
sult'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
i
k
l
os V
a
jna
builtin-merge: give a proper e
r
ror me
s
sage
f
or
i
nv
a
lid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
Vaj
n
a
Teach 'git merge' that som
e
merge strategi
e
s no lo
n
ger
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajna
Ad
d
a new
test f
o
r git-mer
g
e-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
ik
l
os Vajna
t6021: a
d
d
a
new test for
git-me
r
ge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
a
j
n
a
make remove-dashes: apply t
o
scri
p
ts
a
nd progra
m
s
a
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vaj
n
a
git-bisect
:
use dash-
l
ess
fo
r
m on
git bisec
t
log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
10
0
7-hash-
o
bject
.
sh: u
s
e
quotes f
o
r
th
e
tes
t
description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t00
0
1-init
.
sh:
chan
g
e
confus
i
ng direct
o
ry name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
iklos Vajna
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
Fix t760
1
-merg
e
-pull-config
.
s
h
on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-
c
om
m
it-tree: make it
u
s
able from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Ad
d
ne
w
test case to
e
nsu
r
e git-merge prepend
s
the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-
t
o
-gi
t
: use git init
i
nstead of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Va
j
na
hg-to
-
gi
t
: rewrite "git-fr
o
tz" to "git frot
z
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajn
a
hg-to-git: abort if the proj
e
c
t direc
t
ory
i
s
not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-
t
o-git: avoi
d
raisi
n
g
a
string excep
t
i
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
I
N
STALL: Update section about git-frotz f
o
r
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
V
aj
n
a
Retire 'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
A
d
d
new
test
c
ase to ensure git-
m
erge
r
educe
s
oct
o
p
u
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Ad
d
ne
w
test
to e
n
su
r
e git-merge handles more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduc
e
get_octopus_merge_
b
a
s
es() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
V
ajna
git-f
m
t-me
r
ge
-
msg: m
a
ke it u
s
abl
e
f
r
om other
b
uiltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move
read_ca
c
he_unmerged()
to
rea
d
-
cach
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add
new test to
e
ns
u
re git-merge handles pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove parse-options's skip_
p
refix() to git-com
p
at-ut
i
l
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move commit_list_c
o
unt() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Move spl
i
t_cmdline() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajna
path-list document
a
tion: documen
t
a
ll fu
n
ctions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajna
run
-
command
d
ocumentati
o
n: fix "memset()
"
p
arame
t
er
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
ajna
git-read-tree:
document -
v
option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple script to parse the
r
esults fro
m
th
e
t
es
t
cases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
git-rebase -i:
mention
th
e
short c
o
m
m
a
nd aliases i
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
Remove unus
e
d
c
o
d
e in par
s
e_commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strb
u
f documentation: do
c
umen
t
most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Va
j
na
Revi
s
ion walking
do
c
ument
a
tio
n
: do
c
ument
most
i
m
po
r
ta
n
t
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Mik
l
os Vajna
C
odingGuidel
i
nes: Add a n
o
t
e
to avoid
a
ssignments inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git
-
me
r
ge: e
x
clude un
n
ecessary options from OPTIONS_SP
E
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
g
i
t
-
fast-i
m
po
r
t: rename cmd_*() f
u
nct
i
on
s
to parse_*(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklo
s
Vajna
INST
A
LL: add a note about
GNU interactive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
Add
t
e
s
ts f
o
r sen
d
email
.
cc con
f
ig
u
r
ation variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos
Vajna
g
i
t
-send-em
a
i
l
: add
a
ne
w
sendemai
l
.
cc c
o
nf
i
gurati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Vajna
git-
f
ormat-patch: add
a
new fo
r
mat
.
c
c
con
f
iguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vaj
n
a
git c
h
eck
o
ut: add -t
a
lia
s
for
-
-tra
c
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mikl
o
s
V
ajna
d
i
ff
o
ptions d
o
cument
a
ti
o
n:
refer to -
-
dif
f
-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajna
contrib/hoo
k
s: add an
exa
m
ple pre-auto-gc h
o
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
D
o
cumentatio
n
/hooks: add pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Vaj
n
a
gi
t
-gc --auto
:
a
dd p
r
e-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
M
iklos Vajna
Documen
t
atio
n
/git-merge: document
sub
t
ree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
M
ikl
o
s
Vajna
git-gui: Updated Hu
n
gar
i
an trans
l
a
t
io
n
(
e
5
fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
i
klos
Vajna
Update Hungari
a
n translation
.
100
%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
l
o
s Vajna
I
m
p
r
ove
t6029 to che
c
k the real "subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Mi
k
l
o
s Vaj
n
a
Do
c
umentation/git s
v
n
log: a
d
d
a
note
a
bout timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mi
k
l
o
s Vajna
Docum
e
ntat
i
on/git-
f
i
l
ter-branch: add
a
new msg-filte
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Mi
k
l
o
s Vaj
n
a
git
-
clean: handle errors if removing files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Vaj
n
a
Documentation/gi
t
-stash
:
document options for git
stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos V
a
j
n
a
git clone -s docu
m
entat
i
o
n
: force a n
e
w
paragr
a
ph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
M
i
klos Vajna
builtin-gc
.
c:
guard
confi
g
parser
f
r
o
m value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
gi
t
rev-parse
manpage: spe
l
ling fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
gi
t
pull manpage: don't
include
-
n
f
r
om fetch-options
.
t
xt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
M
i
klo
s
V
a
jna
g
i
t-clo
n
e -s: document proble
m
s w
i
t
h
g
it gc --pr
u
n
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
M
ikl
o
s Vaj
n
a
Include rev-list option
s
in git-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote:
a
dd -t and -h op
t
ions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
i
kl
o
s
V
ajna
Add usi
n
g
merge subtre
e
Ho
w
-T
o
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajn
a
t/t7001
:
avoid
unnecessary ERE
wh
e
n usin
g
g
rep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-setup: documen
t
g
i
t
_editor() and get_autho
r
_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyd
a
y: replace 'prune'
a
nd 'repack' wi
t
h
'
gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
a
jna
U
p
date Hungarian translation
.
100%
completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajn
a
I
n
clude
dif
f
options in the git-log manp
a
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
M
i
kl
o
s Vajna
git
-
s
e
n
d-em
a
il: add a new se
n
d
email
.
to c
o
nfigurati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash:
d
ocument ap
p
l
y's --index
s
witch
commit
|
commitdiff
|
tree
2007-09-29
M
i
klos V
a
jna
git-bundle: f
i
x command
l
in
e
examples
i
n
th
e
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Manual: add
a
chapter f
o
r
s
ubmodul
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hung
a
rian translation of git-
g
ui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos V
a
jna
gitweb:
n
e
w cgi paramete
r
: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb
:
prefer git_get_project_owner() ove
r
g
e
t_file_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
Document
-
<n> for git-format-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
