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
V
ajna
cherry-pick/revert:
m
ake direc
t
i
nternal ca
l
l to merg
e
_tr
e
e(
)
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s V
a
jna
builtin-merge: avoid run_comman
d
_v_opt() for
r
ecursi
v
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
merge-re
c
ursive: introduc
e
merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Sp
l
it out merge
_
recursive() to merge-recur
s
iv
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os
V
a
jna
Makefile: en
a
bl
e
SNPRINTF_RETUR
N
S_BOGUS
for H
P
-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
M
i
kl
o
s Vajna
Fix 'git h
e
lp help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos V
a
jna
t9300: rep
l
ace '!' w
i
th te
s
t
_
must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation
:
do
c
ument the pager
.
* configuration settin
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builtin
g
i
t
-
help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
uiltin-help: alw
a
ys
loa
d
_
c
ommand_lis
t
() i
n
c
m
d_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
Add a seco
n
d
t
estca
s
e
f
or handl
i
ng
invalid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
l
o
s Va
j
na
Add a new
test
for
usi
n
g a custom
m
erge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
built
i
n-merge:
allow using
a
custom stra
t
egy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
builtin-help: ma
k
e
so
m
e inter
n
a
l
functions availa
b
l
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t760
1
: exte
n
d t
h
e
'
merge picks
up the be
s
t
r
e
s
ult'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
buil
t
in-m
e
r
g
e: g
i
ve
a
prop
e
r er
r
o
r
m
e
ssage
f
or invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos Vajna
Teach
'
git merge' that
some merge st
r
a
te
g
ies no l
o
n
ger
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
A
d
d
a new test fo
r
g
i
t-
m
e
rge-re
s
olve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new test
f
or git-merge
-
resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
make remove-dashes:
a
ppl
y
to s
c
ript
s
and programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
l
o
s Vajna
git-bisect: use
d
ash-le
s
s fo
r
m on git bise
c
t log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
1
00
7
-hash-obj
e
c
t
.
sh:
u
s
e
quotes for the test description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
lo
s
Vajna
t0
0
01-i
n
it
.
sh: cha
n
ge confusing
direct
o
ry name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajn
a
Build in
merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos V
a
jna
F
ix t7601-merge-
p
u
l
l
-
conf
i
g
.
sh on
AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
it-comm
i
t-
t
ree:
m
ake it usable fro
m
other bui
l
tins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add n
e
w te
s
t case to ens
u
re git-merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-g
i
t: use git i
n
it
instead of gi
t
init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Va
j
n
a
hg-
t
o
-
git:
rewrit
e
"git-frotz"
t
o
"git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-g
i
t: abort if the p
r
oject directory 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
in
g
exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
I
NSTALL: Updat
e
s
e
ctio
n
ab
o
ut git
-
frotz
f
orm
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos Vajna
Retire 'st
u
pid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Add new test case to ensure git-merge
r
educes octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new te
s
t to ensu
r
e git
-
merge ha
n
dles
mor
e
than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce
g
et_octopus_merg
e
_
bases() in c
o
mmit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git
-
fmt-mer
g
e
-msg
:
make it usab
l
e
f
r
om other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read
_
cache_un
m
erge
d
() t
o
re
a
d-cach
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test
t
o
e
n
s
u
re git-m
e
rge
handle
s
pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
M
o
ve
p
ar
s
e-options's s
k
ip_
p
refix
(
) to git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move
commit_li
s
t
_
c
o
unt(
)
to co
m
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Mo
v
e split_cmdline() to al
i
as
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
iklos V
a
jna
path-list documentation: document a
l
l functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
V
ajna
run-command documentat
i
on: fix
"memset()
"
p
aram
e
t
er
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
a
jna
git-read-t
r
ee: doc
u
ment
-
v optio
n
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
kl
o
s
V
ajna
A
s
i
mple scri
p
t to parse the
r
esul
t
s from the testca
s
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos
Vaj
n
a
git
-
rebase -i: me
n
tion the
s
hort
command al
i
a
ses in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
Rem
o
ve unu
s
ed cod
e
in par
s
e
_
c
ommit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
S
t
rbuf d
o
cumentat
i
on: docu
m
ent m
o
st fun
c
tions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision wa
l
king docu
m
entat
i
on: document m
o
st i
m
portan
t
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
CodingG
u
ideli
n
e
s: Add a note to avoid assignments
i
nsid
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-me
r
ge: exclude unnecessary op
t
i
ons f
r
om OPTIO
N
S
_
SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Mik
l
o
s Vajna
git-fast-imp
o
rt: ren
a
m
e
cmd
_
*() function
s
to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mik
l
os Vajna
INSTALL:
add a note about GNU
interactive too
l
s has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajn
a
Add t
e
st
s
for sendemail
.
cc configuration
variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
g
i
t-
s
end-
e
mail: add a
new sendemail
.
c
c configura
t
ion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajn
a
git-format-pat
c
h: add a new format
.
cc configura
t
i
on
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos V
a
j
n
a
git checkout: add
-t alias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos V
a
jna
dif
f
options documen
t
at
i
on: ref
e
r
to --diff-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
contrib/hoo
k
s: add an exampl
e
pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation/hooks: a
d
d pr
e
-aut
o
-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
git-gc --au
t
o
: add pre-auto-
g
c h
o
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vaj
n
a
Docume
n
tation/git-merge:
document su
b
tr
e
e strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklo
s
V
a
jn
a
gi
t
-gu
i
: Updated H
u
ngarian translation (
e
5f
b
a18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vaj
n
a
Update Hunga
r
ian translati
o
n
.
100%
c
om
p
le
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
M
iklo
s
Va
j
na
I
m
pro
v
e t602
9
t
o check
t
h
e
real "subtree" cas
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklo
s
Vajn
a
Documenta
t
ion/git svn log: a
d
d
a not
e
ab
o
u
t
tim
e
zone
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s Vajna
D
o
cument
a
tion/git-
f
ilter-b
r
anc
h
:
add a new
m
s
g-fi
l
ter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Mik
l
os Va
j
na
git-cl
e
an: hand
l
e errors if removing files f
a
ils
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
M
iklos
V
ajna
D
ocumentation/git-stash: document op
t
ions for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Mi
k
los Vajna
g
it cl
o
ne -
s
documentat
i
on
:
fo
r
ce a new parag
r
aph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
b
uiltin-gc
.
c
:
guard config pa
r
ser from value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vaj
n
a
git rev-parse
m
anpage: spelling fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
a
j
na
g
i
t p
u
ll manpage
:
don'
t
include -n
f
r
o
m fetc
h
-o
p
t
i
ons
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Mik
l
os Vaj
n
a
git-c
l
one -s: doc
u
ment proble
m
s
w
ith g
i
t gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklo
s
Vajna
Include rev-list options in
g
it-log manpag
e
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls
-
remote:
add -t and -h
o
ptions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos
V
ajna
Add using merge
s
ubt
r
e
e
H
ow
-
To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
M
i
klos Vajn
a
t/
t
7001:
a
void
un
n
ecessar
y
ERE when us
i
ng grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
M
i
klos
V
ajna
git-sh-setu
p
: d
o
cument
g
it_editor() and get_author_ident_
f
ro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: re
p
lace '
p
rune'
and 'r
e
p
a
ck
'
with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
o
s Vaj
n
a
Up
d
ate Hungarian trans
l
ati
o
n
.
100% comple
t
e
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
I
n
cl
u
d
e
d
i
ff optio
n
s in the g
i
t
-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos
V
ajn
a
git
-
send-email: add a
n
ew sen
d
email
.
t
o configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
M
iklos
Vajn
a
git
stash: document
apply's --index swi
t
c
h
commit
|
commitdiff
|
tree
2007-09-29
Miklos
V
a
jna
g
i
t
-bundle: fix command
l
i
ne
e
xamp
l
es in the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
Use
r
Manual: add a
chapte
r
for sub
m
o
d
ules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian translat
i
on of git
-
gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Mi
k
l
os
V
ajna
g
i
tweb:
n
ew cgi p
a
rameter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
M
i
kl
o
s Vajna
gitweb: pref
e
r
git
_
get
_
p
r
oject_o
w
n
e
r() over
g
e
t_file
_
owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Mikl
o
s Vajna
Docu
m
ent -
<
n> for git-format-
p
atc
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree