repo.or.cz
/
git
/
gitweb-caching.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://repo.or.cz/git-gui
2008-07-23
Miklos V
a
jna
t7601: extend the
'merge picks up the best re
s
ult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mi
k
lo
s
Vajna
b
uil
t
in-merge: give a pr
o
per error message for inva
l
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Vajna
Teach 'git merge' that some merge strategies
n
o longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
Add a new test for git-
m
erge-r
e
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os Vajna
t6
0
21: add a new
t
e
st for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make
r
emove-d
a
sh
e
s
: ap
p
ly to s
c
ripts and
programs a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajn
a
git-bisect: use
d
ash-less fo
r
m on git bise
c
t log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
lo
s
Vajna
t1007-hash-object
.
sh: use
q
uotes
f
or t
h
e tes
t
description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
t0
0
01-init
.
sh: chang
e
c
o
nfusing director
y
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os
V
ajna
Build in
m
e
rge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
Fix t7601-m
e
r
g
e-
p
u
l
l-confi
g
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os
Vajna
git-commit-tree: make
it usab
l
e from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
l
os Vajna
Add new
t
est case
to
e
nsu
r
e git-me
r
ge prepe
n
ds the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vaj
n
a
hg-to
-
g
i
t: use git init
instead of git ini
t
-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
h
g
-
to-g
i
t: rewrite
"
git-frotz"
t
o "gi
t
f
r
otz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajn
a
hg-to-g
i
t: abo
r
t if the project direc
t
o
r
y is
not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
to-
g
it:
a
v
o
id ra
i
s
in
g
a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
INSTALL: Upd
a
te section about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire
'stupid' merge s
t
rategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new te
s
t
case
to ensure git-merge reduces
o
ctopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
A
dd
new test to ensure
g
it-merge handles more t
h
an
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Introduce ge
t
_
o
ctopus_merge_b
a
ses() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s V
a
jna
git-f
m
t-merg
e
-msg:
m
a
k
e i
t
usable from
o
ther
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajn
a
Mo
v
e r
e
ad_cache_unmerged() to
r
ead-
c
ache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Va
j
na
Add
new test to en
s
ur
e
git-merge handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move par
s
e-op
t
io
n
s's skip
_
prefi
x
() to git-com
p
at-u
t
il
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklo
s
V
a
jna
Move
c
ommit_list_co
u
n
t
(
)
to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move split_cmdline() t
o
a
l
ias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklo
s
Vajna
path-list documentatio
n
: document
all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
os
V
ajna
run-c
o
mmand docum
e
ntation:
fix "memset()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
iklos Vajna
git-read-tree: document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
l
os Vajna
A si
m
ple s
c
ript to pars
e
the results from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vaj
n
a
g
it-
r
ebase -i: mention the short
c
ommand aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
R
e
move unused code in
p
arse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Mikl
o
s Vajna
Strbuf
documentatio
n
:
d
ocument mos
t
f
unct
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
i
klos
Va
j
na
Revi
s
ion walking documentat
i
on:
d
o
cument most im
p
ortant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s
Vajn
a
CodingGuideline
s
:
Add a
note to avoid assi
g
nme
n
ts i
n
side
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklo
s
V
ajn
a
git-m
e
rge: exclude unnecess
a
ry options from OPT
I
O
NS_S
P
EC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklo
s
Va
j
n
a
g
i
t
-
fast-import: rename
cmd_*
(
)
f
u
nct
i
on
s
t
o
pa
r
se_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
M
i
k
l
os Vajna
I
N
S
TALL: add a not
e
about GNU i
n
teractiv
e
tool
s
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add te
s
ts fo
r
sendemail
.
cc config
u
ratio
n
v
ar
i
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
git
-
send-email: a
d
d
a
new sendemai
l
.
c
c
conf
i
gurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
g
it-format-patch: add a
new format
.
cc configurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mik
l
o
s
Vajn
a
git checkout: add -t alias for -
-
track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os Vaj
n
a
d
i
ff options documentat
i
o
n
: refer to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
contr
i
b
/hooks: add an example pr
e
-auto-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
Documentat
i
on
/
h
o
oks: add pre-a
u
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajn
a
g
it-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
Documenta
t
ion/git-merge: doc
u
m
ent subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Updated Hun
g
ar
i
an
t
ranslation (e5
f
ba1
8
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mikl
o
s
Vajna
Update
Hungarian transl
a
tion
.
100% c
o
mplet
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
I
m
pro
v
e t6029
t
o check the rea
l
"su
b
tree"
c
ase
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
iklo
s
Vaj
n
a
Documen
t
a
t
i
o
n
/git svn log: ad
d
a
note ab
o
ut timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s Vaj
n
a
Doc
u
mentation
/
git-filter-branch:
add a new
m
s
g-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
g
i
t-clea
n
: ha
n
dle erro
r
s
i
f
r
e
m
oving files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mi
k
lo
s
Va
j
na
Documentati
o
n/git-stas
h
: document options f
o
r
git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklo
s
Vaj
n
a
git clone -s doc
u
mentation:
f
o
rce a new p
a
ra
g
raph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mik
l
os Vaj
n
a
bu
i
l
t
in-g
c
.
c: guard
c
onfig
pars
e
r f
r
o
m
value=N
U
LL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
iklos Vajna
g
i
t rev-parse manpa
g
e
:
spelli
n
g
fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Mik
l
os Vajna
git
pull manpage: don't inc
l
ude -n
f
rom fetch-op
t
ions
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
i
k
los Vajn
a
git-clone -s
:
doc
u
m
en
t
prob
l
ems with gi
t
gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Include rev-l
i
st
o
ptions i
n
git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklo
s
Vaj
n
a
ls-remote: add -t
and -h
o
p
tions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos
V
a
j
n
a
A
d
d using merg
e
sub
t
ree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
i
k
l
os Vajna
t/t7001: av
o
id unneces
s
ary ERE whe
n
u
sing grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajn
a
git
-
s
h-setup:
d
ocument git_edito
r
()
and get_author_
i
dent_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: replace 'prune' and '
r
epack' with
'
g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian trans
l
at
i
on
.
100
%
completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
l
os Vajna
Include diff
options in th
e
git-lo
g
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git
-
sen
d
-email
:
add a
n
ew s
e
nd
e
mail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash: document apply
'
s
--in
d
ex
switch
commit
|
commitdiff
|
tree
2007-09-29
Mi
k
los Vajna
g
i
t
-
bundl
e
: f
i
x commandlin
e
e
x
a
mples in t
h
e manp
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajn
a
User Man
u
al: add a chapter
for su
b
m
odu
l
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
M
iklos
Vajna
Hungarian
t
ranslation of
git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os Vajna
git
w
e
b
:
new c
g
i p
a
ra
m
e
te
r
:
opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Va
j
n
a
gitweb: pre
f
er
g
it_
g
et
_
pr
o
ject_owner() o
v
er get
_
file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos V
a
j
na
Document -<n> for
g
i
t
-format-pa
t
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree