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
Split out merge_recursive() to merge-recursive.c
2008-08-31
Miklos
V
aj
n
a
Split
out m
e
rge_recursive() to merge-recursiv
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Va
j
n
a
Makefile: enable SNPRINTF_RETURNS_BOGUS for H
P
-U
X
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vaj
n
a
Fix
'
g
i
t h
e
lp help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajn
a
t
9
300: replace
'
!' with test_
m
ust_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
Do
c
ume
n
ta
t
ion: do
c
ument th
e
pager
.
* c
o
n
figuratio
n
s
etting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
B
uilti
n
git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
built
i
n-help: always load_comm
a
nd_list() in
c
m
d_help(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
l
os V
a
jna
Add a
s
e
cond
t
est
c
ase fo
r
handli
n
g invali
d
strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
Add a n
e
w test fo
r
using a cust
o
m merge str
a
tegy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajn
a
builtin-merge
:
allow using a
c
us
t
om strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
builtin-help:
m
a
k
e
some int
e
rn
a
l f
u
nctions available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
l
o
s Vajna
t7601: extend the 'merge picks
up the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s Vajna
buil
t
in-merge
:
give a pr
o
p
e
r error messa
g
e
for
i
nvalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
i
klos Vajna
Teach '
g
it me
r
ge' that some merge strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
Add a new tes
t
for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
los Vajna
t60
2
1: add a new test
f
or git-merge-re
s
olve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vaj
n
a
make rem
o
ve-d
a
shes:
a
p
p
ly to scripts and progr
a
ms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vaj
n
a
git-bisect: use dash-less form
on git bisect l
o
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
1
007-hash-objec
t
.
s
h
:
u
se quotes for the
test
description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t0
0
0
1-init
.
sh: change confusing directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
Vajna
B
u
ild in me
r
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Va
j
na
Fix
t
7601-merge-pull-config
.
sh on
AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tree:
m
ake it usable fr
o
m ot
h
er b
u
ilti
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los
V
a
jna
A
dd new test
case to ensure
g
it-merge prepend
s
the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
j
n
a
hg-t
o
-git: use git ini
t
instead of git
i
nit
-
db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git:
r
e
write "git-frot
z
"
t
o "git f
r
otz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os
Vajna
hg-to-git: abort if
the project directory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg
-
to-git: a
v
oid raising a
s
tring
e
xc
e
ption
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INS
T
ALL: Update section ab
o
ut g
i
t
-
f
r
otz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire 'stupid'
merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new test
case
to
e
nsure git-
m
erge reduces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
e
w test to ensure git-merge hand
l
es more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os
Vajna
Introduce get_oc
t
opus_merg
e
_
base
s
() in
commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
lo
s
V
ajna
g
it-fmt-mer
g
e
-
m
s
g:
make it usab
l
e fr
o
m o
t
h
er builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
Vajna
Move read_cache_unm
e
rged() t
o
r
ead-
c
ache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Add new test to
e
nsure git-merge
handles pull
.
twohe
a
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Mo
v
e
p
ars
e
-opti
o
ns's skip_pr
e
fix(
)
t
o
git-compa
t
-uti
l
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
ajn
a
M
o
ve
commit_list_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move spli
t
_cmdline() to alia
s
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
V
ajna
path-
l
ist
documentation
:
document all funct
i
ons and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajna
run-command
docu
m
entation: fix "memset
(
)" p
a
rame
t
er
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read
-
tree: document -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple
script to parse the results from the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
git-reba
s
e -i:
m
entio
n
the
short
comman
d
aliases
i
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajn
a
R
emove unused code in
pars
e
_commit_buf
f
er()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Mi
k
los V
a
jna
Strb
u
f document
a
tion: docu
m
en
t
m
o
s
t
functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Mi
k
los V
a
j
n
a
Rev
i
sio
n
w
a
l
k
ing documentation: document m
o
st importan
t
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
Vajna
CodingGuidelines: Add a
n
ote to
a
void a
s
s
i
g
nments inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-merge
:
exclude unnecessary options
f
rom OPTI
O
N
S
_SP
E
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vaj
n
a
g
i
t
-fast-import: rename cm
d
_*() functions
t
o parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTAL
L
: a
d
d a note about GNU
i
nteractive
t
ools
ha
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add te
s
ts for sen
d
e
m
ai
l
.
cc configuration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
git-se
n
d-e
m
ai
l
: add a new
s
e
ndemail
.
cc config
u
rati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
g
i
t
-format-patch: add a ne
w
format
.
c
c configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
g
i
t checkout: add -t a
l
ias
f
or --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mikl
o
s Vajna
diff options documentation: re
f
er to --diff-
f
ilter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Vajna
contrib/hooks: a
d
d an exampl
e
pre-auto-gc
h
ook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
Documentat
i
on/hoo
k
s:
a
dd
p
re-auto
-
gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-g
c
--au
t
o: add
p
re-auto-gc
h
ook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documen
t
ati
o
n/git-m
e
r
g
e: document subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Updated H
u
ng
a
rian translation
(e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
i
klos Vajna
U
pdate
H
u
n
garian t
r
anslation
.
100% compl
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
M
ik
l
os Vajna
Imp
r
ove t6029 to c
h
e
ck th
e
real "subtree"
c
ase
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
Vajna
Docu
m
entatio
n
/
g
it svn log:
add a note about
t
imezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s Vajna
Docum
e
ntati
o
n/git-
f
i
lter-branch:
add a
n
ew m
s
g-
f
ilter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Mi
k
los
V
ajn
a
git-clean: handle errors if r
e
moving files fail
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos V
a
j
n
a
Document
a
t
i
o
n
/
g
i
t-stash: document opt
i
o
ns for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos V
a
jna
git clone -s documen
t
ation: for
c
e a
new parag
r
ap
h
for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Vajna
builtin-
g
c
.
c:
g
u
ard con
f
ig par
s
er from
v
alue=
N
U
LL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
iklos Va
j
na
git rev-parse
manpage: sp
e
lling
f
ix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Mikl
o
s Va
j
na
git pull manpage: d
o
n't include -n fr
o
m fetch-options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklo
s
Vajna
git-clone -s: documen
t
problems
with git
g
c --
p
r
u
ne
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Mi
k
los Vajna
Inclu
d
e rev-list
o
ption
s
in git-l
o
g
ma
n
page
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos Vajna
ls-remote
:
add
-
t and -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Ad
d
using merge subtree Ho
w
-
To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t700
1
: a
v
oid
unnecess
a
ry ERE when using g
r
ep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajn
a
git-sh-setup: docume
n
t
git_editor
(
) and get_author_iden
t
_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
M
iklos Vajna
everyday: replace 'pr
u
n
e
'
and 're
p
ack'
with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os V
a
j
na
Update
Hungarian translat
i
on
.
10
0
% comple
t
e
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Vajna
Incl
u
de diff options i
n
t
h
e
gi
t
-
l
o
g
m
a
npage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-se
n
d-email:
add
a
new sendemail
.
t
o
c
onfigurat
i
on
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
Vajna
git s
t
ash
:
document apply's --index switch
commit
|
commitdiff
|
tree
2007-09-29
M
i
klos V
a
jna
g
i
t-bundle
:
f
ix commandline examples i
n
the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklo
s
Vaj
n
a
User Manual:
a
dd a chap
t
er for submodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
M
iklos Vajna
Hungarian tr
a
nsla
t
ion of git
-
gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Mi
k
los Vajna
gitw
e
b:
n
e
w
cg
i
parameter: o
p
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
git
w
eb: prefer git_get_project_owner() over get_fil
e
_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos
Vajna
Document -<n
>
for
git-form
a
t-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree