repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-help: always load_command_list() in cmd_help()
2008-07-31
Miklos V
a
jna
bui
l
tin-help: always
l
o
a
d_
c
ommand_l
i
st() in cmd_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a second te
s
tcase for h
a
nd
l
i
n
g invalid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new test
f
or using a custom merge
s
trategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vaj
n
a
builtin-merge
:
allo
w
using a c
u
sto
m
strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
built
i
n-
h
elp: ma
k
e so
m
e int
e
rnal
f
u
nctions available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t
7
601: extend the 'merge picks up the be
s
t
result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
b
uilti
n
-merge: give
a
pr
o
per error me
s
sage for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vajna
Teach 'git m
e
rge' that som
e
merge strategies no
l
onger
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s Vajna
A
dd a new
test
for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
t
6
021: add
a
new test fo
r
git
-
merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
make r
e
move-dashes:
app
l
y to
s
cripts and
p
rograms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vaj
n
a
g
i
t
-bisect: use dash
-
les
s
form on git
bisec
t
lo
g
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
V
a
j
n
a
t1
0
07-h
a
sh-object
.
s
h: use quotes for th
e
t
e
s
t description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klo
s
Vajna
t00
0
1-init
.
s
h: change c
o
n
f
using directory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Va
j
na
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-mer
g
e-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
git-c
o
mmit-tree: m
a
ke it usab
l
e from
othe
r
builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
Add new test cas
e
to
ensure
g
i
t-merge p
r
epends
t
he
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg
-
to-git: us
e
g
i
t init
instead o
f
git i
n
it-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-t
o
-git
:
rew
r
i
t
e "git-frotz" to "git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vaj
n
a
hg-to-git: abort if the proj
e
ct 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: a
v
oid rais
i
ng a stri
n
g excep
t
ion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos V
a
jna
INSTAL
L
: Update se
c
t
i
on
a
b
o
u
t
git
-
f
rotz fo
r
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire 'stupid'
m
e
r
ge str
a
tegy
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Add new test ca
s
e
to e
n
sure git-merge
r
educes octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new test t
o
ensure git-merge
handl
e
s
more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Intr
o
duce get_octopus_merge_bases()
in
c
ommit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
git-fm
t
-me
r
ge-msg: make it
u
s
a
ble fr
o
m
o
t
her bu
i
ltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
M
ove
r
ead_
c
ache_unm
e
r
g
e
d() to read-cac
h
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
V
a
j
na
Add
n
ew t
e
st to ensur
e
git-merge handles pull
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move pa
r
se-
o
p
t
io
n
s
's skip_prefix() to g
i
t-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_lis
t
_count
(
) to c
o
mmi
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
M
ove split_cmdline() to a
l
ias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
p
a
th-lis
t
do
c
umentation: doc
u
ment
a
ll functi
o
ns and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s Vajna
r
u
n
-comm
a
nd documentation
:
fix "memset
(
)"
p
arameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
ajna
git-read-tree: document -v o
p
tion
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Va
j
na
A simple sc
r
i
p
t to
pa
r
s
e
t
h
e
results from the t
e
stcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase -i:
m
e
nti
o
n
the s
h
ort command al
i
as
e
s in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove unused c
o
d
e
in parse_commit_buf
f
er()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Mikl
o
s
Vajna
Strbu
f
d
ocumentation: do
c
u
m
ent most funct
i
ons
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos
V
ajna
Revision
w
alking documentation: d
o
c
umen
t
most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los
V
a
j
n
a
CodingGuidelines: Ad
d
a note to avoid ass
i
gnments in
s
ide
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos
V
a
jna
git-merge:
e
xclude unnecessary option
s
from OPTIO
N
S_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fa
s
t-import: r
e
n
ame cmd_*()
functions to par
s
e_*
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mi
k
lo
s
Vajn
a
INSTALL: ad
d
a note about GNU int
e
ractiv
e
t
ools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
Ad
d
tests for se
n
demail
.
cc configu
r
ation v
a
riable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
aj
n
a
git-se
n
d-
e
mail: add a
n
ew sendem
a
il
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Va
j
na
git-format-pat
c
h: add a new format
.
cc
config
u
ratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos
V
ajna
git checkout
:
add -t ali
a
s for --tr
a
c
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
M
i
klo
s
Vajna
diff option
s
do
c
umentation
:
r
e
fer to --diff
-
filte
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos V
a
j
na
con
t
r
ib/ho
o
ks:
a
d
d an exampl
e
pre-auto-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
Documenta
t
ion/hooks: add pre-
a
uto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
git-gc --auto: ad
d
pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mik
l
os V
a
j
na
D
oc
u
mentation/git-merge: documen
t
subtree st
r
ategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
M
i
klos Vajn
a
g
it-
g
u
i
:
Updat
e
d Hungarian
t
ranslation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
M
iklo
s
V
ajna
Update Hungaria
n
translation
.
100
%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
M
ik
l
os
Vajna
Improve t6029 t
o
check
t
he real "subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
D
o
c
umenta
t
ion/git svn lo
g
:
add a note ab
o
ut
t
imezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mi
k
los Vajna
Document
a
tion/git-fi
l
t
er-bra
n
ch:
a
dd a
ne
w
m
sg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos
Vajna
gi
t
-clean: handle errors if removi
n
g files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
M
iklos Vajna
Do
c
u
m
entation/git-stash:
d
ocument 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
lone
-
s
documentat
i
on: force a new parag
r
ap
h
for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
M
i
k
l
os Va
j
na
bui
l
tin
-
gc
.
c: gua
r
d config parser from
v
alue=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev
-
parse man
p
a
ge: spelli
n
g f
i
x
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Mik
l
os
V
ajna
git pull m
a
npage: don't include -n from fetch-o
p
tions
.
t
xt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
V
ajna
git-clone -s
:
docume
n
t problems with git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Mikl
o
s V
a
jna
In
c
lude rev
-
lis
t
options
i
n git-log ma
n
page
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Mik
l
os Vajna
ls-r
e
mot
e
: add -t and -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
i
k
los Vajna
A
dd using merge subtree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Mik
l
os Vajna
t/t7001: avo
i
d unnecess
a
ry E
R
E
w
he
n
using grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-setup:
d
ocum
e
nt git_editor()
a
n
d get_author_i
d
ent_f
r
o
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: replace 'prune' and 'r
e
pack'
with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
Va
j
na
Update H
u
ngaria
n
translat
i
on
.
100% completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
a
jna
I
n
c
lude
d
i
ff o
p
ti
o
n
s in th
e
g
i
t-log man
p
age
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-send-ema
i
l: add a n
e
w sendemail
.
to configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Mi
k
los V
a
j
n
a
gi
t
s
t
a
sh:
d
o
c
ument apply's --inde
x
swi
t
ch
commit
|
commitdiff
|
tree
2007-09-29
M
i
k
l
os Vajna
git-bundl
e
: fi
x
com
m
andlin
e
e
x
amples
i
n th
e
manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mikl
o
s
Vajna
Us
e
r Manual
:
add a
c
hapter
f
o
r submo
d
ule
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Mi
k
los Vajn
a
Hungari
a
n t
r
anslat
i
on of git-gu
i
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
Miklo
s
V
ajna
gitweb:
n
ew cgi
p
a
r
ame
t
e
r
:
o
pt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vaj
n
a
gitweb: prefer git
_
get
_
p
r
oject
_
owner() over get
_
file_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
M
i
k
los Vaj
n
a
Docum
e
nt -<
n
>
for
git-format-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree