repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update my e-mail address
2008-07-20
Miklos Vajna
Teach
'git m
e
rge
'
that some merge strate
g
ies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s
Vajna
t
6
021: a
d
d a
n
ew test for git-m
e
r
g
e-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajn
a
m
a
ke remove-das
h
es: apply to scr
i
pts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajn
a
git-bisect:
u
se d
a
sh-less form on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t100
7
-
h
ash-ob
j
ect
.
sh: use quotes for
t
h
e
t
est description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: change confusin
g
dir
e
ctory
n
ame
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bu
i
ld in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
Fix
t
7601
-
mer
g
e
-
p
u
l
l-
c
on
f
ig
.
sh on
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
git-co
m
mit-tree: m
a
ke
i
t usable f
r
om o
t
her bu
i
ltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
Add ne
w
tes
t
case t
o
ensure git
-
m
erge prep
e
nd
s
t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajn
a
hg-to-g
i
t: use gi
t
init instead of git init
-
db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg
-
to-git:
r
ewrite
"git-frot
z
" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s V
a
j
na
h
g-to-git: abort if the proje
c
t directo
r
y is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
hg-to-git: avoid raising a
st
r
ing e
x
c
e
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
INST
A
LL: U
p
dat
e
section
abou
t
gi
t
-frotz f
o
rm
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mi
k
los Vajna
R
e
tire
'
st
u
pid' merge strat
e
gy
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add n
e
w test case to ensure git-m
e
rge reduces o
c
topus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new t
e
st
t
o
e
nsu
r
e
g
it-mer
g
e handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
ajna
Introduce get_octopus_merge_bases()
in co
m
mit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
git-fmt-merge
-
msg:
make
it usab
l
e from other buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
n
a
Mo
v
e read_cach
e
_unmerged() to read-ca
c
he
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new test
t
o
ensure
g
it-merge handles pull
.
tw
o
h
ead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move par
s
e-
o
ptions's skip_
p
refix() to git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Va
j
na
Move commit_l
i
st_count
(
) to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move
split_cmdline()
t
o
alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
p
ath-list document
a
tion: document a
l
l functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command documentation: fix "memset()" pa
r
am
e
ter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tr
e
e: doc
u
me
n
t -v
o
p
t
ion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
A
sim
p
le script to parse the results from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
git-rebase -i
:
mention th
e
s
hort command
ali
a
ses in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajn
a
R
e
move unus
e
d code in parse_commi
t
_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
St
r
buf doc
u
mentation: d
o
cument most
functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
i
klos Vajna
Revision w
a
lking
documentation: documen
t
mos
t
im
p
ortant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
C
o
dingGuidelines: Add
a note
to avoid assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklo
s
V
ajna
git-merge: ex
c
lude unnecessa
r
y op
t
i
ons from
OPTIONS_SP
E
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
Vajn
a
git-fast-import: rename cmd_*
(
) functions to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INS
T
ALL:
ad
d
a note
a
b
o
ut G
N
U i
n
te
r
active
to
o
ls has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vaj
n
a
Add
t
ests for
sendemail
.
cc configuration vari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
git
-
send-email: add a new sendemail
.
c
c con
f
igura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos
Vajna
git-format
-
p
atch: add
a
new format
.
cc confi
g
urati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
i
klos Vajna
g
i
t checkout: ad
d
-t alias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mikl
o
s Vajna
diff options
d
ocu
m
entation
:
refe
r
to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
cont
r
ib/
h
ooks: add
a
n example pre-aut
o
-
g
c hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
Documen
t
ation/ho
o
ks: add pre-au
t
o-gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
git-
g
c --au
t
o: add pre-aut
o
-g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vaj
n
a
Documentation/git-merge: document subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
los V
a
jna
g
it-gui: Updated Hungarian t
r
anslation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajn
a
Update Hung
a
rian tr
a
nslation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Mikl
o
s Vajna
I
m
p
rove
t
6029 to ch
e
ck the real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Docume
n
tation/git svn
log: a
d
d a
n
ote
a
bout
t
imezone
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
iklos Vajna
D
o
cument
a
tio
n
/git-filter-branch: add a ne
w
msg-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mik
l
os Vajna
git-clean:
handle err
o
rs
if remov
i
ng
f
iles fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
M
iklos Vajna
Docume
n
t
a
t
i
o
n
/
gi
t
-stash
:
d
ocument optio
n
s
fo
r
git
stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s
V
ajna
g
it clone -s
doc
u
mentation: force a new
paragraph
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mi
k
los Va
j
na
builti
n
-
g
c
.
c: guard c
o
nf
i
g parser from valu
e
=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
gi
t
rev-parse manpage
:
spell
i
ng
f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
ajna
g
i
t pull manpage: don't
inclu
d
e
-n from fetc
h
-
option
s
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
V
ajna
git-
c
lo
n
e -s:
d
ocument problems w
i
th git gc -
-
p
r
une
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Va
j
na
Include rev-
l
ist
o
ptio
n
s i
n
git-lo
g
m
anpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mi
k
los Va
j
n
a
l
s
-remot
e
:
add -
t
and -h opt
i
ons
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Ad
d
usi
n
g merge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajn
a
t
/t
7
0
01: avoid
un
n
ecessary ERE whe
n
using
g
r
ep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklo
s
V
a
jna
git-sh-setup:
d
ocume
n
t
git_editor() and
get_autho
r
_
ide
n
t_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos
Vajna
e
veryday: rep
l
ac
e
'pru
n
e'
a
nd
'
repack' wi
t
h 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
Vaj
n
a
Upda
t
e Hungarian
t
ranslation
.
100%
c
ompleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Va
j
na
Include diff options in th
e
git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-sen
d
-email: add a
n
ew sende
m
ail
.
t
o configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash: d
o
cum
e
n
t
apply's --index
switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-bundle: fix
c
ommandli
n
e examp
l
es in the
manpag
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
klos Vajna
User Manual: ad
d
a
c
ha
p
ter
f
or s
u
bmodu
l
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
Vajna
H
ungarian translatio
n
of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mikl
o
s V
a
jna
g
itweb: new cgi
p
ara
m
eter: o
p
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Va
j
na
gitw
e
b: prefer git_get_p
r
o
ject_o
w
n
er(
)
o
v
er
g
et_fi
l
e_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos
V
ajna
D
ocume
n
t -<n
>
for gi
t
-format-pa
t
ch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree