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
cherry-pick/revert: make direct internal call to merge_tree()
2008-09-03
Miklos Vajna
cherry-pick/
r
ev
e
rt: make direct
i
nternal c
a
ll to mer
g
e_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
builtin-merge: av
o
id run
_
comma
n
d_v_opt() for recur
s
i
ve
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vaj
n
a
merge
-
recur
s
ive: introdu
c
e merge_op
t
ion
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vaj
n
a
Sp
l
it o
u
t merge_recu
r
s
i
ve() t
o
merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
a
jna
Makef
i
le
:
enable SNP
R
INTF_R
E
TURNS_
B
OGUS
f
o
r
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'g
i
t
h
elp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t
9
300:
replace '!' with test_mu
s
t_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
l
o
s
V
aj
n
a
Documenta
t
i
on: document the pager
.
* con
f
ig
u
ration setti
n
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
iklos Vajna
Builti
n
git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklo
s
Vajna
built
i
n-help: always load_comma
n
d_l
i
st()
i
n cmd_help(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos
Va
j
na
Add a s
e
cond testcase f
o
r
h
a
ndling i
n
valid strate
g
ies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
o
s
V
aj
n
a
Add
a
new t
e
s
t for
u
sing
a
custom merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bu
i
ltin-mer
g
e: allow using a custom str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos
V
ajna
builtin-help
:
make some internal
fun
c
tion
s
available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klo
s
Vaj
n
a
t7601: ext
e
n
d
the 'mer
g
e
p
i
cks u
p
the b
e
st result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
V
a
j
n
a
bui
l
t
i
n
-merge: give a p
r
o
per error me
s
s
a
g
e fo
r
invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
i
klos Vajna
T
eac
h
'git
merge' t
h
at some merge
st
r
ate
g
ies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
A
d
d a new
test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos V
a
jna
t6021: add a
n
ew test for git-merg
e
-
res
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
lo
s
Vajna
make re
m
ove-dashe
s
: apply to
s
cripts an
d
p
r
o
g
rams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
g
it-bis
e
ct: us
e
dash-less f
o
rm on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-obje
c
t
.
sh
:
use quotes for
the test des
c
ription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
t0001-in
i
t
.
sh
:
chan
g
e confusin
g
dir
e
cto
r
y name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build
i
n merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
Fix t7601-merge-pull-config
.
sh o
n
A
I
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
g
i
t-commit
-
tree:
make it usable
from other
b
uilt
i
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
a
jna
Add new test c
a
se to ensure git-mer
g
e prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
lo
s
Vajna
hg-t
o
-g
i
t: use git i
n
it inst
e
ad of git
i
n
it-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
h
g-
t
o-git:
rewrite "git-
f
r
otz
"
to "git f
r
otz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to
-
git: a
b
ort if
t
he project direc
t
ory is not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: avoid
r
a
i
si
n
g a
s
tring
e
xception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos
V
ajna
INSTA
L
L: Update
section about
git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Va
j
na
Retire 'stupi
d
' me
r
ge stra
t
egy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new test case t
o
ens
u
re g
i
t-merge
reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
e
w tes
t
t
o e
n
sure g
i
t-
m
erge
handl
e
s
m
ore than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Intr
o
du
c
e get_oc
t
opu
s
_
m
er
g
e_ba
s
es() in c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg:
mak
e
it u
s
able from othe
r
bu
i
ltin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mov
e
read_cache_un
m
erge
d
() to
r
ead-cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new test
to ensure g
i
t-merge handles pull
.
t
wohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move pars
e
-
options's skip_prefix()
t
o git
-
compa
t
-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
commit_list_count() to
co
m
mit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajn
a
M
ov
e
sp
l
it_cmdline
(
) to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
p
at
h
-l
i
st doc
u
me
n
tation
:
docume
n
t a
l
l functi
o
ns and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vajna
run-command doc
u
m
e
n
tation
:
fix "memset()
"
para
m
e
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklo
s
Vajna
g
i
t-read-tree:
d
ocume
n
t -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vajna
A
s
imple sc
r
i
p
t
to
p
arse the res
u
lts f
r
om the
t
estcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
a
j
n
a
git-rebase -i: mention the short
c
o
m
mand
a
liases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vajna
R
e
move u
n
used code i
n
parse_commit
_
buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Mikl
o
s Vajna
Strbu
f
doc
u
m
e
ntati
o
n
:
document most functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revi
s
ion walki
n
g d
o
cumentatio
n
:
document most importan
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos V
a
jna
CodingGui
d
elines: Add a n
o
te to
a
v
oid assignments i
n
side
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
i
klo
s
Vajna
g
it-merge: exclude unneces
s
ary options from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-import: rename cmd_*() functions to p
a
rse_*
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
V
ajna
INSTALL
:
add
a note about GNU i
n
te
r
a
ct
i
ve to
o
ls
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests for sen
d
email
.
cc
c
onfiguration varia
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s Vajna
g
it-send-ema
i
l
: a
d
d a
new send
e
mail
.
cc conf
i
g
u
r
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los Vajna
git-
f
orm
a
t-patch: add a
n
ew form
a
t
.
cc configu
r
ation
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
i
klos Vajna
git
checkout: add -t alias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
d
iff opti
o
ns
d
ocum
e
nta
t
i
o
n
:
r
efer to --
d
i
ff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajna
contrib/hooks
:
add an exam
p
le
pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos V
a
j
n
a
Docume
n
tat
i
o
n
/
hooks: add p
r
e-
a
uto-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Vajna
g
it-gc --
a
u
to: add
pre-au
t
o
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s Vajna
Documentati
o
n/gi
t
-merge: document
s
ubtree str
a
tegy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
iklos Vaj
n
a
g
it-gui: Upda
t
ed Hungari
a
n
translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Upd
a
te Hungarian tran
s
lation
.
100
%
co
m
pleted
.
commit
|
commitdiff
|
tree
2008-02-29
M
i
k
los Va
j
na
Improve t6029 to check the real "sub
t
ree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vaj
n
a
Docum
e
nt
a
tion/git
s
vn log: add a note about
t
imezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Docum
e
ntat
i
on/git-fi
l
ter-br
a
nch:
add a ne
w
msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Va
j
n
a
git-clean: h
a
n
dle errors
i
f removing
f
iles fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos V
a
jna
Do
c
umentation/git-stash: doc
u
ment
o
ptions for git
stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
M
iklos Vajna
g
it clone -s do
c
umentation: fo
r
c
e a new paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
b
uiltin
-
gc
.
c:
g
u
ar
d
config par
s
er from
v
a
l
ue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-parse man
p
age: spelling
fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vaj
n
a
git pull manpage: don't inclu
d
e -n from f
e
tch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklo
s
Vajna
git-cl
o
ne
-s: do
c
ume
n
t
problems with git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajn
a
Include
r
e
v-li
s
t
o
ptions in gi
t
-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mi
k
los Va
j
na
ls-remote: add -
t
an
d
-h o
p
ti
o
ns
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
iklos Vajna
Add u
s
ing merge subt
r
ee How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
i
klos Vajna
t
/t7001: avoid unnecessary ERE wh
e
n using
g
rep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-se
t
up: docu
m
ent git_ed
i
tor() and
get_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
i
k
l
os Vaj
n
a
everyday: rep
l
ace
'p
r
une'
a
n
d 'repack' with
'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
los Vaj
n
a
Update Hungarian translation
.
100% compl
e
te
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Vaj
n
a
I
n
c
l
u
de diff opti
o
ns in the git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos
Vajna
git-send-e
m
ail: add
a new sendema
i
l
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
M
i
klos Vajna
gi
t
stash: doc
u
ment
apply's
-
-
index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
g
it-bund
l
e: fix comma
n
dline examp
l
es in the man
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User Manual: add a chapter for submodule
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian tra
n
s
l
a
t
ion of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mi
k
l
o
s Vajna
gitw
e
b: new cgi parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
M
i
k
l
o
s V
a
j
na
gitweb:
p
refer git_get_project_ow
n
er() over get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
M
i
klos
V
aj
n
a
Document -<n
>
for git-format
-
patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree