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
get_pwd_cwd(): Do not trust st_dev/st_ino blindly
2008-07-23
Miklos Vajna
t
7601: ext
e
nd the '
m
erge picks up the
best resul
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s Vajn
a
b
u
iltin
-
m
e
r
ge:
giv
e
a p
r
oper error message for in
v
a
lid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git m
e
rge'
tha
t
some me
r
g
e str
a
tegies no longe
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos V
a
jna
Add
a new test
f
or g
i
t-
m
erge-r
e
s
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vaj
n
a
t6021: add a new test for
g
it-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os
Vajna
ma
k
e
r
emove-
d
ashes:
apply
t
o scripts
and prog
r
ams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
g
i
t-bisect:
u
s
e d
a
sh-less form on gi
t
bis
e
ct log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-object
.
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 Vajna
t0001-init
.
sh
:
change conf
u
s
i
ng di
r
ectory
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
k
los Vaj
n
a
Buil
d
i
n
m
erg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-me
r
g
e
-pull
-
config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Va
j
na
g
i
t-
c
ommit-t
r
ee
:
make it
us
a
ble from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add
n
ew test c
a
se to ensure
git-m
e
rg
e
prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-t
o
-
git: use git init instead of git init-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajn
a
hg-to-git: rewrite "git-
f
rotz" to "gi
t
frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-git: a
b
ort if the
p
roject di
r
ectory is 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
ising a
s
tr
i
ng e
x
ception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
INSTALL:
Update section abou
t
git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklo
s
V
a
jn
a
Retire '
s
tupid'
merge stra
t
eg
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new test
case to ensure git-me
r
ge reduces octo
p
u
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s Vajna
A
dd
n
e
w
test to
e
nsu
r
e gi
t
-merg
e
handles more th
a
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_octopus_merge_bases() in
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
git-fmt-merg
e
-
m
s
g: make it usable from oth
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move rea
d
_c
a
che_unmerg
e
d()
to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Add new
te
s
t
to en
s
ure
g
i
t
-me
r
g
e
hand
l
es
pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Move parse-options's
skip_prefix() t
o
git-
c
ompat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os
V
ajna
M
o
ve commi
t
_
l
ist_count
(
)
to commit
.
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
Mi
k
los
V
aj
n
a
path-list docum
e
ntation: document all fu
n
ctions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Va
j
na
r
un-command document
a
tion: fix
"memset()" para
m
eter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
ajna
git-re
a
d-
t
r
ee: do
c
u
m
ent -v optio
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Va
j
na
A si
m
ple
s
c
ript to pa
r
se the resul
t
s from the testca
s
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
ik
l
os
V
ajna
git-reba
s
e -i
:
men
t
ion the sh
o
rt co
m
mand aliase
s
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
Rem
o
ve unuse
d
cod
e
in pars
e
_commit_
b
u
f
fer(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Mik
l
o
s
Vajna
Strbuf documentation: document most
functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos Vajna
Rev
i
s
i
o
n walking documentation: do
c
um
e
nt most
i
m
porta
n
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los
V
aj
n
a
CodingGuidelines: Add
a note to av
o
id
a
ssignments in
s
ide
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajn
a
gi
t
-mer
g
e: exclude
unnecessary
o
ptions from OPTIO
N
S_SP
E
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
klo
s
Va
j
na
git-fast-imp
o
rt: rename cmd_*
(
) fu
n
ctions
t
o
par
s
e_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklo
s
Vajna
IN
S
TALL: add a note about
GNU interactive to
o
l
s has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
aj
n
a
Add tes
t
s for sendemail
.
cc co
n
figuration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
o
s
Vajn
a
g
i
t-send-em
a
i
l: add a new se
n
de
m
ail
.
cc c
o
n
figu
r
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajn
a
git-format
-
pat
c
h
:
add a new fo
r
mat
.
c
c configuratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
iklos
Vajna
git c
h
eckout: a
d
d -t
alias fo
r
--
t
rack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
M
ik
l
os Va
j
na
diff o
p
tions do
c
umentation: refer
t
o --d
i
ff
-
filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib
/
hoo
k
s:
a
dd an exam
p
le
pre
-
auto-g
c
ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
l
o
s Vajna
Docu
m
en
t
a
tion/h
o
o
k
s:
add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
k
l
os Vaj
n
a
git-
g
c
--
a
uto:
a
dd pre-au
t
o-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klos Vajn
a
Documentation/gi
t
-
merg
e
: docume
n
t
subt
r
ee strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklo
s
Vajna
git-gui: Update
d
Hu
n
garia
n
trans
l
at
i
o
n (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Up
d
ate Hungarian translation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklo
s
Vajna
Improve t6029 to check the real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Mik
l
os Vajna
D
o
cu
m
entati
o
n/git svn
l
og: add a no
t
e
about
timezon
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos Vajna
Documen
t
atio
n
/git-f
i
lter-branch: add a
n
e
w
msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos
V
ajna
g
it-clean: ha
n
dle
errors if removing f
i
les fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Do
c
umen
t
a
tion/
g
it
-
stash:
document optio
n
s
f
o
r
git s
t
as
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
M
i
k
l
o
s
V
a
jna
git
clone -
s
docum
e
ntation: forc
e
a new parag
r
aph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
iklos Vajna
builtin-gc
.
c: gua
r
d conf
i
g parse
r
from val
u
e=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
ajna
git rev-parse m
a
npage: spell
i
n
g
fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
klos Vajna
git pull manpa
g
e: don't
include -n
f
rom
f
etc
h
-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-c
l
one -s: document probl
e
ms with git
g
c
--p
r
une
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Inclu
d
e re
v
-list options in git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mikl
o
s
V
ajna
ls-r
e
mote: add -t and -h
o
ption
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Va
j
na
Add
using merge subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos V
a
jna
t/t7001:
avoid unnecessary ERE when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-
s
h
-
setup: document git_edito
r
() and get_auth
o
r_
i
d
ent_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Va
j
na
every
d
ay
:
replace 'pr
u
ne' and 'rep
a
ck' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Upda
t
e
Hungarian tran
s
lation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include dif
f
option
s
in the git-log
m
anpag
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-send-ema
i
l:
add a new
s
endemail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
V
a
jn
a
git sta
s
h: document apply
'
s --in
d
ex s
w
i
t
ch
commit
|
commitdiff
|
tree
2007-09-29
M
iklo
s
Vajna
git-bundle: fi
x
commandl
i
ne exampl
e
s in the ma
n
pa
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
Use
r
Manual: add a cha
p
ter for submodu
l
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian t
r
anslation of
git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
i
klos
V
ajna
gitwe
b
: new cgi parameter:
o
pt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mik
l
o
s Vajna
gitweb: prefer git_get_project_owner() over get_
f
ile_owner
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajn
a
Document -<n> f
o
r
git-format-pat
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree