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
commit_tree(): add a new author parameter
2008-09-10
M
i
klos V
a
j
n
a
commit_t
r
ee(): add a new au
t
hor
p
a
ramet
e
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
M
ikl
o
s Vajna
Makefi
l
e
:
add merge_
r
e
c
ursive
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
M
a
kefil
e
: enable SNPRINTF_RETURN
S
_BOGUS
for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
los Vaj
n
a
Fix
'
g
it
help help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
Vajna
t9
3
00
:
re
p
lace '!' with test_mus
t
_fai
l
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docu
m
entation: document
the pager
.
* config
u
ration sett
i
ng
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Buil
t
in
git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
M
i
k
l
os Va
j
na
builtin-help: always
l
o
ad
_
c
o
m
man
d
_li
s
t(
)
in cmd
_
help
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add
a
s
econd testcase for
h
andling inv
a
lid st
r
ategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add
a new te
s
t f
o
r usin
g
a custom merge s
t
rategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
builtin-
m
erge
:
a
llow usi
n
g
a
custom s
t
r
ategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
j
n
a
builtin-help:
m
ake some in
t
ernal fun
c
tions a
v
ailable
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7
6
0
1: extend the 'me
r
ge picks up
the
b
est result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
Vajn
a
builtin-merge: give a proper error
m
e
s
sag
e
fo
r
invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
Vajna
Teach 'git me
r
g
e' that
s
ome merge strategie
s
n
o longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new test for git-merge-re
s
olve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os
V
ajna
t
6
021: add a new t
e
st for
g
it-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
mak
e
rem
o
ve
-
dashes:
apply to scri
p
t
s
an
d
p
r
o
gram
s
as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
g
i
t
-
b
isect:
use dash-less form on git bisec
t
log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-has
h
-object
.
sh: use
q
uotes for
t
he tes
t
descri
p
tion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
a
j
na
t
0
001-ini
t
.
sh: change confusing direct
o
ry
n
a
me
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
u
ild in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajn
a
F
i
x
t
7601-merge-pull-config
.
sh on
A
IX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
git-comm
i
t-t
r
ee:
make it usable fr
o
m oth
e
r
builtin
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Add new test case to ensure git-merge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
o
s
Va
j
na
hg-
t
o
-git: use git in
i
t in
s
tead of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos
Vajna
h
g-to-git
:
rewrite
"git-frotz" to "git fro
t
z"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos
Vajn
a
hg-
t
o
-git: abort if t
h
e
project direct
o
ry is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git:
avo
i
d raising a string exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
INS
T
ALL
:
Update section about gi
t
-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vaj
n
a
R
etire 'stupid
'
mer
g
e
strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case to
e
nsure git-mer
g
e reduces
octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajn
a
Add new test t
o
e
n
sure git
-
merge handles more
t
han
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Introduce get_octopus_merge_bas
e
s(
)
in
c
ommit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
git-fmt-merge-msg:
mak
e
it
usable from other bu
i
l
t
i
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vaj
n
a
Move rea
d
_cache_unme
r
ged() to read-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Add new
t
e
st t
o
e
n
s
ure g
i
t-merg
e
handles
pull
.
t
w
ohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
o
s Vajna
Move parse-optio
n
s'
s
s
kip
_
pre
f
ix() to g
i
t
-
compat-ut
i
l
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Va
j
na
Move commit_lis
t
_
count() to com
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os
V
ajna
Move split_cmdline() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
pat
h
-list
docume
n
tation: document
a
ll func
t
io
n
s a
n
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
r
un-com
m
and documentation: fix "memset()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Va
j
na
git-read-tree: document -v
option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
A simple script to pa
r
s
e
th
e
resu
l
ts
f
rom t
h
e
t
estc
a
ses
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Vajna
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
M
i
k
l
o
s Vajna
Remove unused code in parse_commi
t
_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vaj
n
a
Strbuf
d
ocumen
t
ation: do
c
ument most functi
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Va
j
na
R
evisi
o
n wal
k
ing do
c
umentation: do
c
u
m
ent
most i
m
portant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Mik
l
os Vaj
n
a
CodingGuidelines
:
Ad
d
a no
t
e to avoid assignments
inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
M
i
klos Vajna
git-merge:
exclude un
n
eces
s
ary
o
ptions
f
ro
m
OPTI
O
NS_SP
E
C
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Mik
l
os V
a
jna
git-
f
ast-import:
rename cmd_*
(
)
functions
to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Va
j
na
INSTALL: a
d
d a note abo
u
t
GNU interactive tools has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
Add
t
ests for send
e
m
a
i
l
.
cc configuration v
a
riable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klo
s
Vajna
git-send
-
email: ad
d
a
new
s
e
nde
m
ai
l
.
cc
c
onfiguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-for
m
at-patch: a
d
d a new form
a
t
.
cc configuratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos V
a
jna
git c
h
eckout: add -t alias
fo
r
--track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
los
V
ajna
d
iff options documentation: re
f
er to --diff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
c
o
ntrib/ho
o
ks: add
an example pre-au
t
o-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os
V
ajna
D
o
cumentati
o
n/hooks: add
pre-au
t
o-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
git-
g
c --au
t
o: ad
d
pre-auto-gc h
o
ok
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Mikl
o
s Vajna
Document
a
tion/g
i
t-me
r
ge: doc
u
m
e
nt subtree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Vajna
gi
t
-gui: Updated Hu
n
g
a
rian translatio
n
(e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
U
p
da
t
e
H
u
n
g
arian translat
i
on
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
I
m
prov
e
t6029 to check the real
"
subtr
e
e"
c
a
s
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Va
j
n
a
Documentation/git svn log: ad
d
a note
a
bout timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Doc
u
m
e
n
t
ation/git-fil
t
e
r-branch: a
d
d a ne
w
m
s
g-
f
ilter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
M
iklos Vajna
git-clean: handle errors if removing files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
M
i
klos V
a
jna
Do
c
umentatio
n
/
git-s
t
ash:
do
c
ument options fo
r
git sta
s
h
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone
-
s doc
u
m
e
n
tation: force a ne
w
paragra
p
h
f
or
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
bu
i
ltin-gc
.
c: guard con
f
ig parse
r
f
rom value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
M
i
klos Vajna
git rev-parse manpage: spelling f
i
x
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull manpa
g
e: don't include -n
from fetch-
o
p
t
ions
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
M
i
klos Vajna
git-clone -s: document pro
b
lems with git gc --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Mik
l
o
s
Vajna
Inc
l
ude r
e
v
-list options in gi
t
-log
m
anp
a
g
e
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-re
m
ote: add -t and -h
o
ptions
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Mi
k
los Vajna
A
d
d usin
g
merge su
b
tr
e
e How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos V
a
jna
t/t7001
:
a
v
o
id unne
c
ess
a
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-setup: docume
n
t git_ed
i
tor
(
)
and get_author_ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mikl
o
s Vajna
ever
y
day: replace 'prune
'
and
'
repack' with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
U
pdat
e
Hungari
a
n transl
a
t
i
on
.
100% completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
a
jna
Inclu
d
e diff options in the
git-
l
og manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
M
ik
l
os
Vajn
a
g
it
-
send-email: add a new
s
end
e
mail
.
to configu
r
a
tion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git s
t
as
h
: doc
u
men
t
app
l
y's --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajn
a
git-
b
undle
:
fix
c
ommandl
i
n
e
exa
m
ples
in t
h
e manp
a
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mik
l
os V
a
j
n
a
User
Ma
n
ual: add
a c
h
apter for submodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
V
ajna
Hungar
i
an trans
l
atio
n
of git-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
M
iklos V
a
jna
gitweb:
n
ew cg
i
parameter: opt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
M
i
klos Vajna
g
i
t
w
e
b
: pr
e
fer git_g
e
t_project_owner(
)
ove
r
ge
t
_file_own
e
r()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Va
j
na
Document -<n> fo
r
g
i
t-format-
p
atch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree