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
git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
2008-07-23
Mi
k
los Va
j
na
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
b
u
iltin-mer
g
e: give a
p
roper error message for
i
nvalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
T
e
a
ch 'git
merge' th
a
t so
m
e merge strategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos V
a
jna
Add a
ne
w
t
e
st for
g
i
t
-merg
e
-re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklo
s
Vajna
t
6
021: add a
new
t
est for git-me
r
ge
-
resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
Vajna
make remove-dashes: ap
p
l
y
t
o scripts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisec
t
: use dash-le
s
s form on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
l
os Vajna
t10
0
7-hash-obj
e
ct
.
sh: use quotes f
o
r t
h
e test
descr
i
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: change confu
s
ing directory
n
ame
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
Vajna
Build i
n
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix
t
76
0
1-merg
e
-
pull-config
.
sh on AI
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
git-commit-tr
e
e: ma
k
e it usable from oth
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
ikl
o
s Vajn
a
Add
n
ew test c
a
se to ensure git-merg
e
prepends
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Va
j
na
h
g-to-git: use git ini
t
i
nste
a
d of git
i
nit-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
l
os Vajna
hg-to
-
git: re
w
rite "git-frotz"
to "git
f
rotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
to-git: abort if
t
he
p
rojec
t
d
irectory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
a
jna
hg
-
to-git: av
o
id raising a
string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: Update se
c
tion about
g
it-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
iklo
s
Vajn
a
Retire 'stupid' merge s
t
rategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
ew test
case
t
o ensur
e
gi
t
-merge red
u
ce
s
o
ctopu
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
Add new tes
t
to ensure git-
m
erge handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Introduc
e
g
et_octopus_merge_bases()
i
n com
m
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajn
a
g
it-fmt-merge-msg: make it usable from oth
e
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mov
e
r
ea
d
_cache_unmerg
e
d() to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add new test to ensur
e
git-merge handles pu
l
l
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s V
a
jna
Move parse-
o
ptions's skip_
p
ref
i
x() to git-comp
a
t-u
t
i
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
Vajna
Move commit_list_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vaj
n
a
Move split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path
-
list
d
ocumentation: docume
n
t all
fu
n
ctions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command
d
ocumentation:
f
ix
"
mem
s
et()" p
a
rameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
git-read-tree:
doc
u
me
n
t -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
A simp
l
e
s
cript to parse th
e
re
s
ults f
r
om
the te
s
tcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
g
i
t
-rebase -
i
: me
n
tio
n
the short command aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajn
a
Remove unused
code in parse_commit_buffe
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklo
s
Vajna
Strbu
f
documentation:
d
ocument most f
u
nctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos Vajna
R
evisio
n
w
a
lkin
g
docume
n
tation: do
c
ument mo
s
t important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
iklos Vajna
CodingGuidelines:
Add a note to
a
voi
d
assignments
i
nsid
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
los
Vajna
gi
t
-merge: exclu
d
e unnecess
a
ry options from OP
T
I
O
N
S
_SP
E
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
ik
l
os Vajna
git
-
fast-impo
r
t:
r
enam
e
cmd_*(
)
functi
o
ns to parse_*(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
M
i
kl
o
s Vajna
I
N
S
T
ALL: a
d
d a note abou
t
GNU i
n
tera
c
tiv
e
tools ha
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Va
j
na
Add tests for sendemail
.
cc c
o
nfigurat
i
on variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
git-
s
end-email: add a n
e
w sendem
a
il
.
cc
c
onf
i
gurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
git
-
f
orma
t
-
p
a
tch: add a new forma
t
.
c
c co
n
f
i
gurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
iklos V
a
jna
git checko
u
t:
a
dd -t a
l
ias for
-
-track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff options d
o
c
umentation: refer to --dif
f
-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vaj
n
a
contrib/h
o
oks:
add an ex
a
m
p
le
pre-auto-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Doc
u
mentation/hooks: add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Vaj
n
a
git
-
gc --au
t
o: add pr
e
-au
t
o
-
gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos
V
a
j
n
a
Documentation/git-merge
:
do
c
ument
subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui
:
Update
d
Hun
g
arian translation (e5fba18
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mik
l
os
V
ajna
Update Hungari
a
n tra
n
slati
o
n
.
100
%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
Vajna
Improve t
6
029 to check t
h
e
r
eal "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos V
a
jna
Docum
e
ntation/git svn log: ad
d
a note a
b
o
ut timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
iklo
s
Vajn
a
D
o
cumentation
/
git-filter-branch: add a new msg-f
i
l
t
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
M
i
klos Vajna
git-cl
e
a
n: handle err
o
rs if remo
v
in
g
files
f
ail
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklo
s
Vajna
D
ocumen
t
ation/git-stash:
do
c
u
m
ent options fo
r
git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mi
k
lo
s
Vajna
git cl
o
ne -s do
c
umen
t
at
i
on: force a new paragraph
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
i
klos Vajna
builtin-gc
.
c: guard config parser
from value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
g
i
t rev-parse man
p
age:
s
pell
i
ng fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklo
s
Vajna
git pull manpage
:
do
n
't include
-
n from fetch-opt
i
o
ns
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos
V
ajn
a
git
-
c
lo
n
e -s:
d
oc
u
m
e
n
t problems w
i
th git gc --pru
n
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
V
ajn
a
I
n
clud
e
rev-list opt
i
o
n
s
in git-lo
g
m
anpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mik
l
os Vaj
n
a
ls-remote: add -t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mi
k
lo
s
Vajna
A
dd using me
r
ge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t
7
001: avoid unn
e
cessary ERE when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklo
s
Vajna
g
it-sh-setup: docu
m
e
n
t
git_edit
o
r
() and get_author_iden
t
_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: rep
l
ace 'pr
u
ne' and '
r
epack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Vajna
Updat
e
Hungarian tran
s
lat
i
on
.
100%
complet
e
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
ik
l
os Vajn
a
Include d
i
ff opti
o
ns in the gi
t
-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Mik
l
os
V
ajn
a
git-send-email:
a
dd a new sendemail
.
to
c
o
nfiguratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash: document apply's
--index switc
h
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-b
u
nd
l
e: f
i
x
commandline examp
l
es in
the
manp
a
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Mi
k
los
Va
j
na
U
ser Man
u
al
:
ad
d
a ch
a
pter for submodule
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos
Vajna
Hungarian trans
l
ation of git-
g
ui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Va
j
na
gitweb: new cgi
p
arame
t
er:
opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos V
a
j
n
a
gitweb: prefer gi
t
_
get_project
_
o
w
ne
r
() ove
r
get_file_owner(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
M
i
k
lo
s
V
a
jna
Documen
t
-<n
>
f
or git-f
o
r
mat-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree