repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-merge: give a proper error message for invalid strategies in config
2008-07-22
Miklos Vajna
buil
t
i
n
-merge: give a p
r
oper error
m
e
s
sag
e
for
i
nv
a
li
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Va
j
na
Teach 'gi
t
merge' that some
merge strategie
s
n
o
l
ong
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add
a ne
w
test for
git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los
Vajna
t6021: add a
new test
for git-merge-reso
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
mak
e
remove-dash
e
s:
app
l
y to scri
p
ts and
prog
r
am
s
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: use da
s
h
-le
s
s form on gi
t
b
isect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
a
j
na
t1007-hash-ob
j
e
c
t
.
sh: use quo
t
es f
o
r the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
n
a
t0001-init
.
sh: change co
n
f
using direct
o
ry name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
iklo
s
Vaj
n
a
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-me
r
ge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
git-
c
ommit-
t
ree:
make it usable from oth
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test case to
e
n
s
ur
e
git-merge
p
repends
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-t
o
-git: use git init instead of gi
t
ini
t
-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
h
g-
t
o-g
i
t
:
rewrite "git-frotz" to "g
i
t frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
hg-to-git: abort if the p
r
o
ject direct
o
ry i
s
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-to-git
:
avoid r
a
i
s
i
ng a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL:
U
pdate
s
ection about git-fro
t
z form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajn
a
R
e
tire 'stupi
d
' me
r
ge
s
trategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case to ensure
g
it
-
merge reduces octop
u
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new t
e
st to ens
u
re git-mer
g
e handles mo
r
e than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Introd
u
ce get_octopus_merge_
b
ases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
git
-
f
mt-mer
g
e-msg: make i
t
usa
b
le
f
rom other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
a
jna
Move read
_
cache_
u
nmerged
(
) to read-
c
ache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Va
j
na
Add
n
ew test to ensure git-merge handles
pu
l
l
.
t
woh
e
ad
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s
Vajn
a
Move parse
-
opt
i
ons'
s
skip_prefi
x
() to git
-
compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move com
m
it_
l
ist_count() to
c
ommi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
os Vajna
pat
h
-list d
o
cum
e
ntati
o
n: document
a
ll funct
i
ons and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
r
u
n
-com
m
and
docu
m
en
t
ation:
fix
"memset()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
a
j
n
a
git-read-tree: doc
u
m
e
nt -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A
si
m
p
l
e
script to parse the results from the t
e
s
t
cases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-re
b
ase -i:
menti
o
n the sh
o
rt command aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los V
a
jna
R
emove unused code in parse_commi
t
_buff
e
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vajn
a
Strbuf documen
t
ation: doc
u
ment most f
u
n
ctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
i
k
los Vajna
R
e
vision walking docum
e
ntati
o
n: d
o
cum
e
nt
most
i
mportant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
Co
d
in
g
Guidelines: Add a note to avoid
a
ssignments i
n
side
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajn
a
git-me
r
ge:
e
xclude unn
e
ces
s
ar
y
opti
o
ns from O
P
TIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
k
los Vajna
g
i
t-fast-
i
m
p
ort: rename cm
d
_*() functions
t
o parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: add a note a
b
ou
t
GN
U
interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajna
A
d
d tests f
o
r sendemail
.
cc configuration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
g
it-
s
end-email:
a
d
d
a
new sendemail
.
cc configurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
j
na
git-f
o
rmat-pat
c
h
:
add a
new format
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos
Va
j
na
git che
c
kout: ad
d
-t a
l
ias for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
Vajna
d
i
ff op
t
ions documentation:
r
efer to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/hooks
:
add an example
pre-a
u
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
a
jna
D
o
cumentation/hooks: add
p
r
e-auto-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
git-gc
-
-auto: add
pre-
a
uto-
g
c
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Doc
u
menta
t
ion/git-merge: document
subtree
st
r
ategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajn
a
g
i
t-gui
:
Updated Hungarian translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mik
l
os Vajna
Update
Hungarian transl
a
tion
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t602
9
to
check
t
he real
"subtr
e
e" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
V
ajna
Docume
n
tation/git svn lo
g
: add a note a
b
o
u
t
ti
m
ezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklo
s
Vajna
Documen
t
ation/git-fil
t
er-branch:
add a n
e
w
msg-f
i
lter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
M
ikl
o
s
V
a
j
na
git-
c
lean: han
d
le
errors if
removing files f
a
i
ls
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos V
a
jn
a
Documentation/git-st
a
sh: document options for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s Vajna
git clone -s docu
m
entation: force a
n
e
w paragr
a
p
h
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos
V
a
j
na
bu
i
lt
i
n
-g
c
.
c: guard c
o
nfig parser from
v
a
l
u
e=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
os Vajna
git rev-parse
manpage:
s
pelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
iklos Vaj
n
a
git pul
l
manpag
e
:
don't
i
nclu
d
e
-n fro
m
f
etch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
i
klos Va
j
n
a
git-clone -s:
d
ocu
m
ent pro
b
lems with git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mi
k
los Vajna
Include rev
-
list
o
ptions
i
n git-log ma
n
pag
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mi
k
los Vajna
ls
-
remote: add -t
a
nd -h
options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mik
l
o
s
Vajna
Ad
d
u
sing m
e
rge
sub
t
ree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Mi
k
los Vajna
t/t7
0
0
1
: avoid unnecess
a
r
y E
R
E wh
e
n using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh
-
setup:
d
ocument
g
it_editor() and get_a
u
thor
_
iden
t
_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mik
l
o
s
V
a
jna
e
veryday: re
p
lace 'prune' a
n
d 'repac
k
' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
iklos
V
ajna
Update
Hungarian translatio
n
.
100% co
m
pleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
In
c
lu
d
e diff o
p
tions in the git-l
o
g manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
iklos Vajna
git-send-email
:
add a new sendem
a
il
.
to config
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mik
l
os V
a
jn
a
git stash:
document apply's --i
n
dex switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-bundle: fix
c
ommandli
n
e exampl
e
s in t
h
e manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos V
a
j
n
a
User Man
u
al: add a c
h
apter
for
s
ubmodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
H
u
ngarian
translation of git-gu
i
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vaj
n
a
gitweb: new cgi
parameter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
M
i
klos V
a
j
n
a
g
itw
e
b: prefer git
_
get_pr
o
j
e
c
t
_owner
(
) over ge
t
_fi
l
e
_
o
w
ner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajn
a
Doc
u
m
ent -<n>
f
or
g
it-f
o
rmat-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree