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
builtin-merge: allow using a custom strategy
2008-07-30
Mikl
o
s Vajna
builtin-merge: a
l
l
o
w using a cust
o
m
s
trate
g
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los V
a
jna
builtin-he
l
p: ma
k
e some i
n
t
e
rnal functio
n
s available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos Vajna
t7601: extend
the 'me
r
ge picks up the be
s
t
r
e
sul
t
'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vaj
n
a
built
i
n-mer
g
e: give a
p
roper
e
r
ror message for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los Vajna
Teach '
g
it merge'
that some merge strategi
e
s
no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
los Vajna
Add a new
t
e
st for
g
i
t-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
t6021: ad
d
a
new test for git-
m
erge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
mak
e
remove-dashes: apply to scri
p
ts
and programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajn
a
git-bise
c
t: us
e
dash-l
e
s
s form on git
bi
s
ect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
t
1
007-hash-object
.
sh:
u
se quotes
for the
t
est description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t
0001-init
.
sh: change confusing directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
u
i
ld in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajn
a
Fix
t7601-merge-pull-c
o
nfig
.
sh o
n
AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tree
:
m
ake
i
t usable
fro
m
other
builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Add
n
ew test
case to ensure git
-
merge
p
repen
d
s the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: use
git
i
ni
t
instead
o
f git in
i
t-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: rewrit
e
"git-frotz" to "git frot
z
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos 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
Mi
k
l
o
s Vajna
hg-to
-
git
:
a
v
oid raising a string exc
e
p
ti
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL:
Update
sec
t
io
n
about git
-
frotz for
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajn
a
Retire 'stu
p
id' mer
g
e
s
trate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new test ca
s
e
t
o
ensure g
i
t-merg
e
reduces oct
o
pus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new test
to en
s
ure git
-
m
e
rge handles mor
e
than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Introdu
c
e get_octop
u
s_merge_bases() in c
o
m
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: make i
t
u
sabl
e
from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
M
o
ve read_c
a
che_u
n
merged
(
)
to read-
c
a
c
he
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Add new test to
e
n
s
ure git-merge
handles pull
.
tw
o
h
e
a
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move parse-options's skip_prefix() to git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move commit
_
list_cou
n
t() to
c
ommit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
M
o
ve split_
c
mdline() to alia
s
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s Vajna
path-li
s
t
d
o
cumen
t
ation:
d
ocument
a
ll functions an
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
run-command documentation: fix "mems
e
t()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
g
i
t-rea
d
-tree: document -
v
op
t
ion
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Vajna
A
simpl
e
script
t
o
pa
r
se the res
u
lt
s
from the testcas
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vaj
n
a
git-re
b
ase -i: mention the sho
r
t command
aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os
V
ajna
Remove
u
nused code in par
s
e_commit_buffer
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
V
ajna
Strbuf docu
m
entation: doc
u
ment most function
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision walking d
o
cumentation: doc
u
ment most impor
t
a
nt
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
Co
d
ingGuidelines: Add a note to
a
void
as
s
ignments i
n
side
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos
V
a
j
n
a
g
i
t-merge: exclude u
n
necessary opti
o
ns fro
m
OPT
I
ONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
M
i
k
l
o
s
Vajna
git-fast-import:
rename cmd_*() functions to
p
ar
s
e_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL:
a
dd a note about GNU interactive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajna
Add tests for sendemail
.
c
c
config
u
ratio
n
variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
g
it-send-email:
a
dd a new sendemail
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajna
g
it-format-
p
atch
:
a
dd
a new format
.
cc conf
i
guration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos V
a
jna
git checkout: ad
d
-t alias
f
or --t
r
ack
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Va
j
n
a
d
i
ff opti
o
ns documen
t
ation
:
refer to --diff-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vajna
contri
b
/hooks: add an e
x
ample pre-a
u
to-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
D
o
cumentat
i
on
/
hoo
k
s:
add p
r
e-auto-gc
h
ook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-g
c
--auto: add pre-auto
-
gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Doc
u
men
t
a
t
ion/git-me
r
ge: do
c
umen
t
subtree strateg
y
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui
:
Updated
Hungarian transl
a
tion (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hunga
r
ian translation
.
100% co
m
pleted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
V
ajna
Imp
r
ove t6029
to check th
e
real "subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
M
iklos Vajna
Documentation/g
i
t svn
l
og: add a note about
t
i
mezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documentation/git-filt
e
r-br
a
nch: add a
n
e
w msg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Mik
l
os
V
ajna
g
i
t-clean
:
h
andl
e
errors if removing files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos V
a
jna
Documen
t
at
i
on/git
-
stash: d
o
c
u
ment opti
o
ns for git s
t
ash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s Va
j
na
git clon
e
-s documentation:
for
c
e a ne
w
paragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Vajna
builti
n
-g
c
.
c: guard confi
g
parser from value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
a
jna
git rev-parse manpag
e
: s
p
el
l
ing fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull manpage:
don't inclu
d
e -n
from fetch-op
t
i
o
ns
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s: d
o
cument pr
o
blems w
i
th
g
it
gc --
p
rune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Include
rev-li
s
t opti
o
n
s
in git-log man
p
age
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos V
a
jna
ls-remote:
a
dd
-
t and -h o
p
tions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vaj
n
a
Add using
mer
g
e
subtr
e
e
How
-
To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Va
j
na
t/t7001:
avoid unnecessary ERE when using grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
M
i
klos
V
a
jn
a
git-sh-set
u
p: document gi
t
_editor() and get_au
t
hor_i
d
ent_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
los Vajna
everyday: replace
'
prun
e
'
a
nd 'repack' with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
U
p
date Hungarian translation
.
100
%
completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
i
k
lo
s
Vaj
n
a
Include diff options in the git-log m
a
npage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
M
i
klo
s
Vajn
a
git-send
-
email: add
a
new sendemail
.
to
c
onfiguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vaj
n
a
git
s
tash: document apply's
-
-index switch
commit
|
commitdiff
|
tree
2007-09-29
Mik
l
os Vajna
git-b
u
ndle
:
f
i
x comman
d
line examples in th
e
manpag
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
M
iklos Vajna
User Manual: ad
d
a c
h
apt
e
r
f
or s
u
bm
o
dules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian translation
o
f git-
g
ui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos V
a
jna
git
w
eb: new cgi parameter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: prefer
g
it_get_projec
t
_own
e
r()
o
ver get_fi
l
e_own
e
r()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
i
k
l
o
s Vajna
Document -<n> for git-
f
ormat-
p
atch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree