repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7601: extend the 'merge picks up the best result' test
2008-07-23
Mi
k
los Vajna
t7
6
0
1
: e
x
tend th
e
'mer
g
e
pick
s
up the best result
'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
bui
l
tin-merge: gi
v
e a
proper erro
r
m
e
s
sage for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
Vajna
Te
a
ch 'git m
e
rge' that
s
ome merg
e
strategies
n
o
l
onger
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vaj
n
a
Add a new
t
e
st for git-m
e
r
ge-r
e
s
olve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
V
a
jna
t6
0
2
1
:
a
dd a new
t
est for g
i
t-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
make remov
e
-dashes: a
p
ply to script
s
a
n
d programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
gi
t
-bisect: use das
h
-less form on
g
it
bis
e
ct log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
t1007-hash-ob
j
e
ct
.
sh: use q
u
ote
s
for t
h
e test description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: change confusing d
i
rectory 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
M
i
klos Vaj
n
a
Fix t7601-merge-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
git-co
m
mit-
t
ree: mak
e
it
usable from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
Add new t
e
st case t
o
e
nsu
r
e git
-
m
e
r
g
e pre
p
ends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os V
a
j
n
a
h
g-to
-
git: u
s
e git init instead
o
f git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
hg-to-git: rewr
i
te "git
-
frotz" to "gi
t
frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-
t
o-gi
t
: ab
o
rt if the p
r
oj
e
ct d
i
rectory is no
t
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-
t
o
-
g
i
t
:
avoid
r
ais
i
ng a string exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INST
A
LL: Update section abo
u
t gi
t
-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire
'
stupid'
m
erg
e
strat
e
g
y
commit
|
commitdiff
|
tree
2008-07-01
M
iklos V
a
jna
Add new test
case to ensur
e
git-merge reduces
octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new
t
est
to ensure git-merge handle
s
more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Introduce get_o
c
to
p
u
s
_merge_bases() in co
m
mit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
g
i
t
-fmt-merge
-
msg: make it us
a
bl
e
from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cache_unmerged
(
)
t
o read-ca
c
he
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new tes
t
to ensure git-merge h
a
ndl
e
s
pu
l
l
.
twoh
e
ad
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move parse-options's
s
kip_pr
e
fix() to git-compat-
u
til
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Move commit_l
i
st_count() to
c
o
m
mit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move split_cm
d
line
(
) to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-
l
ist documentation:
d
ocument a
l
l f
u
nctions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
ik
l
os Vajna
run-command documentation: fix "memset()"
p
a
r
ameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Va
j
na
g
i
t-rea
d
-tree: document
-v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
A simpl
e
script to parse the
r
esults from th
e
t
e
stcase
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
a
j
na
git-
r
ebase -i:
mention th
e
short
command aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Va
j
na
R
emove unused code
in
parse
_
c
ommit
_
b
uffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos
Vaj
n
a
S
t
r
b
uf docu
m
enta
t
i
on: document most
f
unctions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vaj
n
a
Rev
i
sion walk
i
ng d
o
cumentati
o
n: documen
t
m
o
st important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajn
a
Codin
g
Guidelines
:
Add a not
e
t
o avoid a
s
signments
i
nside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Va
j
n
a
git-m
e
rge: exclude unnecess
a
ry options from OPTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklo
s
V
a
jna
git-f
a
st-
i
mport
:
r
e
name
c
m
d
_*()
f
unction
s
t
o par
s
e
_
*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INST
A
LL: add a note about GNU inter
a
ctive
t
ools ha
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
Add test
s
for sendemail
.
cc configuration var
i
able
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
jna
g
i
t-send-email: ad
d
a new
sendemail
.
cc
co
n
figuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git
-
f
o
rmat-
p
a
t
ch: add a new format
.
cc
c
onf
i
gura
t
i
on
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklo
s
Vajna
git c
h
eckout: add -t alias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
Vajna
diff options
do
c
umentation: re
f
er
t
o --diff-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Vajna
contrib/hooks: add an example pre-a
u
to-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
Docum
e
ntati
o
n/hooks: add pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
git-gc --auto: add pre-au
t
o-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Document
a
tio
n
/git-me
r
ge: do
c
ument
subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Update
d
Hungarian translation
(e5fba
1
8)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklo
s
Vaj
n
a
U
p
date Hu
n
gar
i
an tran
s
latio
n
.
100
%
compl
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
M
i
klo
s
Vajna
Improve t6029
t
o check the r
e
al "subtree"
c
ase
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
Vajna
Docu
m
e
nta
t
i
on/git svn log: ad
d
a note a
b
out ti
m
e
z
ones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mi
k
lo
s
Vajna
Documentation
/
git-f
i
lter-br
a
nch: add a new ms
g
-
filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
M
i
k
los Vajn
a
gi
t
-clean: handle errors if
removing f
i
les fa
i
ls
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Mik
l
os Vajna
Documentat
i
on/g
i
t
-sta
s
h: docum
e
nt option
s
for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
g
it
clone -s doc
u
mentation: f
o
rc
e
a new p
a
ragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos
V
a
j
na
bui
l
tin-gc
.
c:
guard
c
onfig pars
e
r
from
v
alue=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-parse manpage: spe
l
l
ing fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
Vajna
g
i
t pul
l
manpage:
d
o
n
't include -n from fetch-op
t
io
n
s
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone
-
s: document
p
r
o
blems
with
git gc --prun
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Va
j
n
a
I
nclude rev-list options
i
n git-log m
a
n
p
age
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Mi
k
l
o
s Vaj
n
a
ls-remote:
a
dd -t and -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
iklo
s
Vajna
Add using merge subtree H
o
w-
T
o
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos
V
a
j
na
t/t7001: avoid unnece
s
sary E
R
E when using gre
p
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vaj
n
a
g
i
t-sh-s
e
tu
p
:
document git_editor() a
n
d
g
et
_
author_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
M
iklos Vajna
everyday: rep
l
ace 'prun
e
' and 'repack'
w
ith
'
gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os Vajna
Update Hungarian transla
t
ion
.
100% completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
iklos Vajna
Include
d
iff opti
o
ns in
the
git-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vaj
n
a
git-send-e
m
ail: add a new
sendem
a
il
.
to configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
V
a
jna
git stash
:
document apply
'
s --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos
V
ajna
git-b
u
ndle: fix commandline ex
a
mples in t
h
e manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
U
s
er
Man
u
al: add a ch
a
pter for submo
d
ul
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
V
ajna
Hungarian tra
n
slatio
n
of git-
g
ui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vaj
n
a
g
i
tweb
:
new cgi
p
aram
e
t
er: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Mi
k
los Vajna
gitweb: prefer git_get_pr
o
ject_o
w
n
er() over get_file_o
w
ner(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos V
a
j
na
Document -<n
>
fo
r
git-
f
ormat-p
a
tch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree