repo.or.cz
/
git
/
gitbuild.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
m
e
rge-recurs
i
ve: introdu
c
e merge
_
options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
Split o
u
t merge_recursive(
)
t
o
m
e
rge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefil
e
:
e
nable SNPRIN
T
F_RE
T
URNS_BOGUS for H
P
-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Mik
l
o
s Vajna
F
i
x 'git h
e
lp help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Mik
l
o
s
Vajn
a
t9300: replace '!' with test_mu
s
t_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
Va
j
na
Documen
t
atio
n
:
d
oc
u
me
n
t the pager
.
* c
o
nfiguration setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
V
a
j
n
a
Builtin git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
bui
l
tin-help: a
l
way
s
lo
a
d
_
command_list() in cmd_help(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos
Vajn
a
Add a second testcase for h
a
ndl
i
ng i
n
vali
d
str
a
te
g
ies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
V
a
jna
Add
a
n
e
w
t
e
s
t for using
a
custom
merge
s
t
rategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
bu
i
ltin-merge: a
l
low using a custom stra
t
egy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
builti
n
-help: make som
e
internal
f
un
c
t
i
ons available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend the 'merge picks up the best
result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
bui
l
tin-merge:
g
ive a
p
rope
r
e
r
ro
r
mes
s
age f
o
r invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos Vajna
T
each 'git merge'
t
h
a
t some m
e
rge st
r
at
e
gies
no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s Vaj
n
a
Add a new test for git
-
me
r
ge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajna
t6021
:
a
dd a new
t
e
st for git-m
e
rge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
m
a
ke re
m
ove-dash
e
s: apply
t
o
script
s
and programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os
Vajn
a
g
i
t-b
i
s
ect: 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 Vajn
a
t1007-has
h
-object
.
sh:
use quote
s
for the test desc
r
ipti
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
t
0001-i
n
it
.
sh:
change co
n
fu
s
ing directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bu
i
ld
in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
a
jna
Fix t7601-merge
-
p
ull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
V
ajna
git-commit
-
t
ree: make
it usable from other built
i
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new tes
t
case to ensure git-merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajna
hg-to-git
:
use git init ins
t
ead of git
init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git: rewrite "gi
t
-frot
z
" to "
g
it frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vaj
n
a
h
g-to-git
:
abort if the project directory is n
o
t
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git
:
avoid r
a
ising
a
s
t
ring
e
xception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
INSTALL: Up
d
ate section about
g
it-fr
o
tz fo
r
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Mikl
o
s
V
a
j
na
R
etire 'stupid' merge st
r
ategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os Vajna
A
d
d
n
e
w tes
t
case
t
o
ensure git-merg
e
reduce
s
o
ctopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new
t
est to ensure g
i
t-merge hand
l
es mo
r
e
than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
V
a
jna
I
n
t
rodu
c
e get_oc
t
opus_merge_bases
(
) in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
g
i
t-fmt-merge-msg:
make i
t
usable from othe
r
bu
i
ltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move r
e
ad_cache_unmerge
d
()
to read-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
A
dd new
t
es
t
to ensure g
i
t-merg
e
h
a
ndl
e
s pu
l
l
.
t
wohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
M
ove p
a
rse-opti
o
n
s
'
s
skip_prefi
x
(
)
to git
-
c
ompat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ove commit_
l
ist_c
o
unt()
t
o comm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e split
_
cmdline
(
) to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
path-
l
i
st doc
u
mentation:
document a
l
l funct
i
ons an
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
r
un-command documenta
t
ion: fix "memset()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
l
os Va
j
na
git-read
-
tree: docum
e
nt -v
o
p
tion
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simp
l
e scr
i
pt to parse the results from the test
c
as
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Vajna
gi
t
-rebase -i
:
mention the sh
o
r
t
command aliases
in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
Rem
o
ve un
u
sed co
d
e
in parse_commi
t
_bu
f
fer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos V
a
jna
S
trbuf docume
n
ta
t
ion: document most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s Vajna
Revis
i
on walking documentat
i
on: docum
e
n
t
most imp
o
rtan
t
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklo
s
V
a
jna
CodingGuideli
n
es:
Ad
d
a note to a
v
o
i
d assignments
i
n
s
i
de
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
M
iklos Vajna
g
i
t-merge:
exclud
e
unnecessa
r
y options from OP
T
IONS_SP
E
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
gi
t
-fast-import: rename
cmd_*() functions
to pa
r
se_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos
Vajna
INSTA
L
L: ad
d
a note
ab
o
ut GNU interact
i
ve tool
s
has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
iklo
s
Va
j
n
a
A
d
d te
s
t
s
for send
e
mail
.
cc config
u
r
ation varia
b
le
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s Vajna
g
i
t-send-
e
m
a
i
l
: a
d
d
a
new sen
d
email
.
c
c
co
n
figura
t
ion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
git-f
o
rmat-patch: add a new format
.
c
c
c
onfiguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
gi
t
c
h
eckout:
a
dd -t alias
f
or --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos V
a
jna
diff options docu
m
en
t
a
t
i
o
n: refer to --diff-
f
ilte
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
c
ontrib/hooks:
add a
n
example pre-auto-
g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
Documentation/hooks: add
p
re
-
auto-
g
c hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
git-gc -
-
auto
:
ad
d
pr
e
-auto-
g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mi
k
los V
a
jna
Documenta
t
ion/git-merge: doc
u
m
e
nt subtree strate
g
y
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos
Vajna
git-gui: Updated
H
ungarian
translation
(e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
los Vaj
n
a
U
p
date
H
u
ng
a
rian translation
.
100%
c
ompleted
.
commit
|
commitdiff
|
tree
2008-02-29
Mik
l
os Va
j
na
Improve
t
6
029 to
c
h
e
c
k
t
h
e real "subtree
"
c
ase
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos V
a
jna
Documen
t
ation
/
git s
v
n
log: add
a note abou
t
timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos Vajna
Do
c
umen
t
ation/git-filter-branch:
a
dd a new msg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: handle error
s
i
f
removing
fil
e
s
fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Do
c
u
mentatio
n
/git-stash:
document o
p
tions for g
i
t stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
g
it clone -s d
o
cumentation: force a new parag
r
aph fo
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin-gc
.
c:
g
uard config
p
a
r
ser from va
l
ue=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklo
s
Vajna
git
r
e
v
-pars
e
manpa
g
e: spelling
f
ix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pu
l
l
m
anpa
g
e:
don't include -n fro
m
fetch-options
.
t
xt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
M
i
klos Vaj
n
a
git-clone
-
s
:
d
ocument problems wit
h
git gc --p
r
une
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
Vajna
Include rev-list o
p
t
i
ons in git-log
m
anpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos
V
a
jna
ls
-
r
emote:
a
d
d
-
t
a
n
d -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajn
a
Ad
d
using merge su
b
tree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos V
a
jna
t/t7001: av
o
id
u
n
n
e
cessary E
R
E
whe
n
u
s
i
n
g grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Mi
k
los Vajna
git-sh-setup:
d
oc
u
ment git_editor
(
)
a
nd
g
et_author
_
ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
M
i
klos Vajna
everyday:
replace
'
prun
e
'
a
n
d
'repack' with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungar
i
a
n
t
rans
l
ation
.
100%
c
omple
t
ed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include diff op
t
ions in the git-log
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Va
j
na
git-
s
e
n
d-
e
mail: add a ne
w
s
e
ndem
a
i
l
.
to con
f
igu
r
ati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Va
j
na
git stas
h
: doc
u
men
t
apply's --i
n
dex
s
w
i
t
ch
commit
|
commitdiff
|
tree
2007-09-29
Mikl
o
s Va
j
na
git-bundle:
f
ix
commandline
examples
in
t
he manpa
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
Vajna
User Manual: add a chapter for
s
u
bmodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
M
iklos V
a
jna
H
u
n
garian tr
a
nsla
t
ion of git-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gitweb: new cgi pa
r
ameter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos
Vaj
n
a
gitwe
b
:
p
refer git_get_proje
c
t
_
owner() over ge
t
_file_owner
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
i
klos Vajna
Document -<n> for g
i
t-format-pa
t
ch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree