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
Add a new test for using a custom merge strategy
2008-07-30
Miklos
Vajna
A
d
d a
ne
w
test for
u
s
ing a custom merge st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
kl
o
s Vajn
a
builtin-merge
:
a
llow using a custom
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vaj
n
a
builtin-help:
ma
k
e some inte
r
nal functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t
7601: e
x
tend the 'merge picks u
p
the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos
V
a
j
n
a
b
uilti
n
-merge: give a prope
r
error message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajn
a
Teach 'git m
e
rge' that some merge
stra
t
e
gie
s
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
Add
a
new test fo
r
git-merge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
o
s V
a
j
n
a
t6021
:
add a new test
f
o
r
git-merge-res
o
l
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajn
a
mak
e
remove-dashes: apply to
s
c
ripts
a
n
d
progr
a
m
s as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
it-bisect: use dash-
l
ess form on
g
it bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Va
j
na
t
1
007-hash-object
.
sh: use quotes f
o
r
t
h
e
te
s
t description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-ini
t
.
sh: c
h
a
n
ge confusing
d
ire
c
t
o
ry
n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos
V
ajna
Build in m
e
rge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
l
os V
a
jna
Fix t7601-merge-
p
ull-
c
onfi
g
.
sh
on AI
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
V
ajna
git-commit-
t
ree
:
make i
t
usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Add
new test c
a
se to
e
nsure git-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-t
o
-
g
it: us
e
git
init instead o
f
git init
-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g
-
to-git:
r
ewri
t
e "git-frotz" to "g
i
t
f
rotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-gi
t
: abo
r
t
i
f the project directory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: avoid
r
aising a string
exce
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos V
a
jna
INSTALL: Up
d
ate se
c
tion
about gi
t
-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos Vajn
a
R
e
tire 'stu
p
id' me
r
ge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
ew
test
c
ase to ensure git-me
r
ge
reduces oc
t
opus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new t
e
st
to
ensure git-merge ha
n
dl
e
s
more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Introduc
e
ge
t
_octopus_merge_base
s
() in c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
ikl
o
s Vajna
g
it-fmt-
m
erge-msg: ma
k
e
i
t usa
b
l
e
f
r
om o
t
her builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
v
e read_cache_unmerged() to
r
ead-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add
new test to ensure git-mer
g
e hand
l
e
s
pull
.
twoh
e
ad
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move parse-option
s
's ski
p
_prefix() to git
-
c
o
mpat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los V
a
jna
Mov
e
c
o
m
mi
t
_l
i
st_count() t
o
c
o
m
m
it
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
M
ove split_cmdline()
to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajn
a
path-l
i
st
docume
n
tation: docum
e
nt all function
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-c
o
mmand doc
u
mentation: fix "memset
(
)"
p
aramete
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-r
e
a
d
-tree: document -
v
option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Vajna
A simple script t
o
parse the
r
esults
from the tes
t
cases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Va
j
na
git-rebase -i: mention the short command a
l
ias
e
s in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove unused code in parse_com
m
it_b
u
ff
e
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
V
aj
n
a
S
trbuf do
c
ume
n
tation
:
d
oc
u
ment most functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklo
s
Vajna
Revision walking
d
ocumentation: doc
u
men
t
most impo
r
tant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklo
s
Vajna
CodingGuidelines: A
d
d a note t
o
avo
i
d assi
g
nments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos V
a
j
na
git-m
e
r
g
e: exclude unnecessary options
from
OPTIONS_SP
E
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mik
l
os
V
ajna
git-f
a
st-import: rename cmd_*() functions to
parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mi
k
los Vajna
INSTALL: 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 tests for sendemail
.
cc config
u
ration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
j
na
git-
s
e
nd-email: add
a
new sendemail
.
cc configurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajn
a
git-format-patch
:
add a new f
o
rmat
.
cc con
f
iguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vaj
n
a
git che
c
kout
:
add
-t alias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os Vajna
diff options documentat
i
on:
refer to -
-
diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
contrib/hooks: add an example pre-auto-
g
c hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
Documenta
t
ion
/
h
o
o
ks: add pre
-
auto-g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
git-gc --auto: add
pre-a
u
t
o-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s V
a
jna
Documen
t
a
t
ion/
g
i
t-merge: document
subtree stra
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
it-gui: Updated Hungaria
n
translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
lo
s
Vaj
n
a
Updat
e
Hu
n
gar
i
an translation
.
100% c
o
mpleted
.
commit
|
commitdiff
|
tree
2008-02-29
M
iklos Va
j
na
Imp
r
ove
t
6029
to check the real
"su
b
tree" c
a
se
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Va
j
na
Docum
e
ntati
o
n/
g
i
t svn log: add a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documentati
o
n/git
-
f
il
t
er-branch
:
add a new msg-filt
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos V
a
jna
git-clean: h
a
ndl
e
er
r
o
r
s i
f
removing files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mik
l
os Vaj
n
a
Documentation/git-
s
tash: document
o
p
t
ions fo
r
g
it stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklo
s
Vajna
git
clone -s documentation: force a new paragra
p
h for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklo
s
Vajna
b
u
ilt
i
n
-
gc
.
c: gu
a
rd
con
f
ig parser fr
o
m value=NUL
L
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
i
k
l
o
s V
a
jn
a
git rev-p
a
r
se manpage
:
spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklo
s
V
a
jn
a
git pull man
p
age
:
don't
i
n
clude -n from fetch-op
t
ions
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
g
it-clone -s: document proble
m
s wit
h
g
i
t gc -
-
prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
V
ajna
I
nclude
r
ev-list options i
n
git-log manp
a
g
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mikl
o
s Vajna
ls-remote: add -t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vaj
n
a
Add using merge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Mik
l
o
s
Vajna
t/t7001: av
o
i
d
unnec
e
ssa
r
y E
R
E w
h
e
n using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
M
iklo
s
Va
j
na
git-s
h
-setup:
document g
i
t_ed
i
t
o
r() an
d
get_au
t
h
o
r_
i
den
t
_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: replace 'prune' and 'repack'
with '
g
c'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
U
p
date
H
un
g
arian transl
a
tion
.
100% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Va
j
na
I
nclude di
f
f options
i
n th
e
g
it-log man
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-se
n
d-email:
a
dd a new sendemail
.
to configurati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mi
k
l
os Vajna
gi
t
s
tash: do
c
u
m
ent a
p
ply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Mikl
o
s Vajna
git-bundl
e
: fix co
m
mandline examples in the man
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklo
s
Vajna
Us
e
r Manual: a
d
d a chapter
for
s
ubmodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mi
k
los Vajn
a
Hungarian translation of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os V
a
jna
git
w
eb: new cgi p
a
rameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
M
iklo
s
V
ajna
gitweb: prefer
git
_
get_project_
o
wner()
o
v
e
r
ge
t
_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos
V
ajna
Documen
t
-<n
>
for
g
it-f
o
rmat-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree