repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: introduce merge_options
2008-08-31
Miklos Vajna
merge-recursive: intr
o
d
u
ce merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
n
a
Split ou
t
merge_recurs
i
ve() to merge-rec
u
r
sive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vaj
n
a
Makefile: enable SNPRINTF_RETURNS_
B
OG
U
S
f
o
r
HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix
'
git help help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t93
0
0:
replace '!' with test_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los Vajna
Doc
u
mentati
o
n: document
t
he pager
.
* con
f
i
g
urat
i
on s
e
t
t
i
n
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Built
i
n git-h
e
l
p
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
built
i
n-h
e
lp: always load_
c
o
mmand_
l
ist() in cm
d
_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a second test
c
ase for h
a
n
d
ling invalid
str
a
t
egies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vaj
n
a
A
dd a new test for
using a custom merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
builtin-merge: all
o
w
using a cus
t
om st
r
ategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajn
a
built
i
n-help: make some int
e
r
n
al funct
i
ons available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t
7
6
01: e
x
tend the 'merge picks up the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
Va
j
na
builtin-merge
:
give a prop
e
r
error message
f
or
i
nvalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Vajn
a
Te
a
ch 'git merge' that some m
e
rge strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
A
d
d
a n
e
w t
e
st f
o
r
g
it-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os Vajn
a
t
6021:
add a new test for
git-m
e
rge-resolv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-dashes:
a
pp
l
y to scripts and
p
rograms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
git-b
i
sect:
u
se dash-less
f
o
r
m on git bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t1007-hash-object
.
sh:
u
se quotes for
the tes
t
descri
p
t
i
on
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t00
0
1-i
n
it
.
s
h:
chang
e
c
o
nfusing dire
c
t
ory n
a
m
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los Vajna
B
uild in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los
Vajna
Fix t
7
601-m
e
rge-pu
l
l-conf
i
g
.
s
h on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
i
t
-commit-tree: make i
t
u
sable f
r
om othe
r
builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajn
a
Add new test ca
s
e to
ensure
gi
t
-merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-
g
it: use git
init inst
e
ad of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
h
g
-
t
o
-
g
i
t: rewrite "git-
f
rotz" to "git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git:
a
bort if
t
he project direc
t
ory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
h
g-
t
o-git
:
avo
i
d raising a string
e
xcepti
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
INSTALL: Update section
a
bout gi
t
-frot
z
form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire
'stupid' merg
e
str
a
teg
y
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
A
d
d new t
e
st
c
as
e
to ensure git-merg
e
red
u
ces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Add new test to en
s
ure git-merge han
d
les
more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_
o
ctopus_merg
e
_base
s
(
)
in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git
-
fmt-merge-ms
g
: mak
e
it u
s
able from
o
ther builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move
r
e
ad_cache_u
n
m
e
rged() to read-cac
h
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
V
ajna
Add
new test t
o
ens
u
re git-merge handles pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-options
'
s s
k
ip_pref
i
x() to git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os Vajn
a
Move commit_lis
t
_c
o
unt() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
ajn
a
Move split_
c
mdl
i
n
e
() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
iklo
s
Vajna
path-list doc
u
mentation
:
document all functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
iklos
V
ajna
r
un-command docume
n
ta
t
i
on: fix
"
m
e
mset()
"
p
arameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklo
s
Vajn
a
git-re
a
d-
t
ree: document -v
option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajn
a
A
simple
script to parse t
h
e resul
t
s f
r
om
t
he tes
t
c
a
ses
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los
Vajn
a
git-rebase -
i
:
m
e
n
tion the short command aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
Remove u
n
us
e
d code
i
n
parse_commit_buff
e
r()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Mik
l
os V
a
jna
Strbuf documentation: docum
e
nt mo
s
t f
u
n
c
tions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision wa
l
king
documen
t
at
i
on: do
c
ument
m
ost impo
r
t
ant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
Vajna
Coding
G
uideline
s
: A
d
d a note to avoi
d
assig
n
men
t
s inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
g
i
t-merg
e
: exclude un
n
e
c
e
s
sary o
p
tions from OP
T
IONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
gi
t
-fast-import: rename cmd_*()
f
u
nctions to parse_
*
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTAL
L
: add a note
a
b
o
ut GNU
interactive tools ha
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
l
o
s
Vajna
Add tests for
send
e
mail
.
cc configuration v
a
riable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
git-send-em
a
i
l: add a new sendemail
.
cc conf
i
gura
t
i
on
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
git-form
a
t
-patch: add a n
e
w f
o
rmat
.
c
c
conf
i
gu
r
ation
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklo
s
V
a
jna
git
checkout: add -t ali
a
s for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos V
a
jna
diff opti
o
ns
documenta
t
ion: refer to --d
i
ff-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
c
o
ntrib/hooks: ad
d
an ex
a
mple pre-auto-gc h
o
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
Documentation/hooks:
add pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajn
a
git-gc --a
u
to: add
pre-auto
-
g
c
ho
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentation/gi
t
-merg
e
: document subtree
strate
g
y
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mikl
o
s Vajna
git-gu
i
: Update
d
Hungarian t
r
ansla
t
ion (e5fba18
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mikl
o
s Vajna
Update
Hung
a
rian translati
o
n
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Mi
k
l
o
s
V
a
jn
a
Improve t6
0
29 to check
the real "
s
ubtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Doc
u
mentat
i
o
n/git
svn
l
o
g
:
add a note about timezon
e
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documentation/git-fi
l
te
r
-
b
ra
n
c
h
: add a
n
e
w ms
g
-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Va
j
na
git-c
l
ean
:
hand
l
e errors if
r
em
o
vin
g
f
iles fa
i
ls
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
Vajna
Docume
n
t
ation/git-sta
s
h: document options
f
o
r
git sta
s
h
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git c
l
one -
s
documentation
:
force a
ne
w
pa
r
agr
a
p
h
for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Vaj
n
a
bu
i
ltin-gc
.
c:
guard con
f
ig parser from val
u
e=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
i
kl
o
s Vajna
g
i
t
rev-p
a
r
s
e
manpage: spelli
n
g
fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
M
i
klos Va
j
na
git
pull manpag
e
: don't incl
u
de -n from fetch-options
.
tx
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vaj
n
a
git-clone -s: d
o
cum
e
n
t pro
b
lems with git gc
-
-
p
run
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vaj
n
a
Include rev-list o
p
ti
o
ns in git-log
m
anp
a
ge
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vaj
n
a
ls-rem
o
te: add -t and -h
options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
iklos Vajna
Ad
d
using
m
erge subtree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/
t
70
0
1:
a
v
oid unnecessa
r
y ERE when using grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
g
i
t-sh-s
e
tup: d
o
cument git_editor()
and
g
et_author_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
ev
e
ryd
a
y:
replace
'prune' a
n
d 'repack'
w
it
h
'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajn
a
Update
H
u
n
garia
n
translation
.
100% com
p
leted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
M
iklo
s
Vaj
n
a
Include diff options in
the git-log manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-send-
e
mail:
a
dd a new
s
endemail
.
to configurati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklo
s
V
ajna
git stas
h
: d
o
cument apply's -
-
index sw
i
tch
commit
|
commitdiff
|
tree
2007-09-29
M
i
klos Vajna
git-bu
n
dle: fix comman
d
lin
e
exampl
e
s in the manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mik
l
os Va
j
n
a
User Manua
l
:
add
a
c
h
a
p
t
er f
o
r
s
ubmodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos V
a
jna
Hungarian t
r
anslation of g
i
t-
g
ui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Mikl
o
s Vajna
gitweb: new cgi paramete
r
: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklo
s
Vajna
g
i
tweb: pre
f
er
git_get_pro
j
ect_owner() ov
e
r get_file_own
e
r
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Mi
k
l
o
s V
a
j
n
a
Document -<n> for git-for
m
at-pa
t
ch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree