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
Merge branch 'jc/maint-log-grep'
2008-09-03
Miklos Va
j
n
a
Makefile: ad
d
merge
_
re
c
urs
i
ve
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vaj
n
a
Mak
e
f
i
le: enable SNPRINT
F
_RETURNS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mik
l
os Vajna
Fix
'
git h
e
lp help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mik
l
os Vajna
t9300: r
e
place
'
!' with test_must_f
a
il
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
o
s
V
ajna
Docume
n
ta
t
ion: document th
e
pager
.
* con
f
iguration
s
e
ttin
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mi
k
l
o
s
V
ajna
Built
i
n
g
it-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mikl
o
s Vajna
bui
l
tin-help
:
always l
o
a
d
_command_l
i
st()
i
n cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
Add a second testcase
f
or handling invalid
s
trate
g
ies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
A
d
d
a new t
e
s
t
for u
s
ing a c
u
stom m
e
rge strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
buil
t
i
n-merge:
allow
u
sing a custom s
t
r
at
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
buil
t
in-h
e
lp: make some inter
n
al functions ava
i
lable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
los Vajn
a
t760
1
: extend the 'merge pi
c
ks up the b
e
st r
e
sult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
b
uilti
n
-me
r
ge: gi
v
e
a proper error
m
ess
a
ge for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos
V
ajna
Teach 'git merge
'
that some merge strat
e
gies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
A
d
d a
new test
for git
-
merge-re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
t60
2
1: add a new
t
est for git-m
e
r
g
e-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
mak
e
re
m
ove-dashes:
a
pp
l
y to sc
r
ipt
s
and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
gi
t
-bisect: use
d
ash
-
less form on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
V
a
j
na
t1007-hash-object
.
sh: u
s
e
quotes
for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: change
confus
i
n
g d
i
rectory
n
ame
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
k
los
V
aj
n
a
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
Fix t
7
601-
m
e
rge-pull
-
config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-comm
i
t-
t
ree: mak
e
it usa
b
le from oth
e
r bu
i
ltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test ca
s
e to ensur
e
git-
m
erg
e
prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
to-git: use git
i
nit inste
a
d
of git
i
nit-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos
V
ajna
hg-to-git: rewri
t
e
"
git-frotz
"
to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
h
g-to-git: abort if
t
h
e
p
r
o
ject
d
irect
o
ry i
s
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
ex
c
epti
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
l
o
s Vajna
I
N
S
TALL: Update
se
c
tion about
git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos
V
aj
n
a
Ret
i
r
e
'stu
p
id' m
e
rge
s
trategy
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Add new
t
est ca
s
e to ensure git-m
e
rge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Add new test
t
o ensure
git
-
merge handles more th
a
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
I
ntroduce
get_octopus_merge_bas
e
s() in commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git
-
fmt-m
e
rge-msg: ma
k
e it usable from other built
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mov
e
read_cache
_
unmerg
e
d
()
t
o
rea
d
-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Add
n
e
w
test to
e
nsure gi
t
-m
e
r
ge handles p
u
ll
.
t
w
o
head
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move
parse-
o
p
t
i
o
ns's skip_pref
i
x() to git-compat-
u
til
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los V
a
jna
Move commit_list_count() t
o
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
s
p
l
i
t
_c
m
dline()
to al
i
as
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s V
a
jna
p
a
th-list docu
m
en
t
ation:
docu
m
ent all fu
n
cti
o
ns
a
nd
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajna
run-command docu
m
entati
o
n: f
i
x "memset()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read
-
tree: do
c
ument -v opt
i
on
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
a
jna
A
simple script to parse the results fr
o
m the t
e
stcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
a
jn
a
git-rebase -i: mentio
n
the short co
m
mand
a
l
i
a
s
e
s in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove unused
code in parse_commit_b
u
ff
e
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
S
t
rbu
f
doc
u
mentation: docum
e
nt most functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos Vajna
R
evisi
o
n w
a
l
king d
o
c
um
e
nta
t
ion: d
o
cument
m
ost
imp
o
r
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos V
a
j
na
CodingGuid
e
lines: A
d
d a note to avoid assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-me
r
ge:
e
xclude unnecessary optio
n
s
from OPTIONS
_
SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
Vajna
git-fast
-
import: ren
a
m
e
c
m
d_*(
)
f
unctions to
pars
e
_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INST
A
L
L
: add a n
o
te about GNU interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Ad
d
t
e
sts for send
e
ma
i
l
.
cc c
o
nfig
u
ration
v
ariable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
git-send-email: add a new send
e
mail
.
cc config
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
g
i
t-format-patch: add a new
f
orma
t
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Va
j
na
git checkou
t
: a
d
d
-t alias
for --t
r
a
ck
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
V
ajna
diff option
s
docume
n
tation: refer
to --diff
-
f
i
lte
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/hooks: add an example pre-auto-
g
c h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vajna
Docum
e
ntation/hooks: add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
k
l
os Vajna
git-gc --aut
o
:
add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vaj
n
a
Docum
e
ntation/git-merge: doc
u
m
e
nt subtre
e
strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
i
t
-
gui:
Updated Hung
a
ri
a
n translation (e5fba1
8
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
M
i
k
l
o
s
Vajn
a
Update Hu
n
garian
t
r
a
nslation
.
10
0
%
compl
e
ted
.
commit
|
commitdiff
|
tree
2008-02-29
M
iklos Vajna
Improve t6029 to check
t
h
e
r
e
a
l
"subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Mikl
o
s V
a
j
n
a
D
o
cument
a
ti
o
n/git sv
n
lo
g
: add a note
a
bo
u
t t
i
mezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
V
ajna
Documentation/git-f
i
lte
r
-br
a
nch: add a n
e
w msg-filt
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mi
k
los V
a
jna
g
i
t-clean: handle err
o
rs
if
r
emoving f
i
les f
a
ils
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklo
s
Vajna
Do
c
umentation/git
-
stash: document option
s
for git sta
s
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mi
k
los Vajna
git c
l
o
ne
-s
d
ocumen
t
at
i
on: force
a ne
w
p
aragrap
h
f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos
V
aj
n
a
builtin-gc
.
c
:
guard c
o
nfig parser from value
=
NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
ajna
git re
v
-parse ma
n
page
:
spelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
klos
Vajna
gi
t
pull man
p
age: don't inc
l
ude
-
n f
r
om fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-clone -s: docume
n
t p
r
oblems with git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Va
j
na
Includ
e
re
v
-l
i
s
t
op
t
ions
i
n git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mikl
o
s Vajna
ls-remote: add -t
a
n
d -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
A
d
d
using merge subt
r
ee
H
o
w
-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos V
a
jna
t/t7
0
01: av
o
id unnecessary
E
RE wh
e
n
u
s
ing grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-
s
h-s
e
t
u
p: doc
u
ment git_ed
i
tor(
)
and get_a
u
tho
r
_i
d
ent_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
i
k
l
os Vajna
ev
e
ryday: rep
l
a
c
e 'prune'
a
nd
'rep
a
ck' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os
V
ajna
Update Hungarian translatio
n
.
100
%
compl
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
I
nclude
d
iff opti
o
ns in the git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vaj
n
a
git-s
e
nd-email: add a new se
n
d
e
mail
.
t
o
configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash:
d
ocument ap
p
ly's -
-
index swit
c
h
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git
-
bundle: f
i
x
c
omm
a
ndline examp
l
e
s
i
n the ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
klos Va
j
na
User
Manua
l
: add
a
chapt
e
r for subm
o
dules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mi
k
los
Vajna
H
ungar
i
an translation
o
f
git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
gitweb:
new
cgi parameter: op
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajn
a
gitweb: prefer gi
t
_g
e
t_project_owne
r
() over ge
t
_f
i
le_owner
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
D
o
cumen
t
-<n>
f
or
git-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree