repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint-1.5.6' into maint-1.6.0
2009-06-21
Miklo
s
Vajna
git-svn documentatio
n
: fix typo in 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
los Vajna
SubmittingPatches: mention th
e
usage
o
f real name
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vaj
n
a
h
t
t
p
.
c: use 'git_config_
s
tring'
t
o ge
t
'curl
_
http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
Use
r
's Manual:
remove duplica
t
ed
u
rl at
t
he end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Va
j
na
Add new t
e
stcase t
o
show fast-export does no
t
alway
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
iklos Vajna
update-ref --n
o
-
deref -d: handle the
c
a
s
e when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git branch -m: forbid renami
n
g o
f
a
symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git upd
a
te-re
f
--no-deref
-d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
rename
_
re
f
(): handle
the case when th
e
reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
Fix git b
r
anch -m
f
o
r symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add
t
estcase
t
o
ensure
mer
g
ing an
e
arly par
t
of
a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mik
l
o
s Va
j
na
te
s
t-li
b
: fix co
l
or rese
t
i
n
sa
y
_
c
o
lor()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Va
j
na
t7501: alway
s
use
t
est_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
los Vajna
M
ake
f
ile: add mer
g
e_rec
u
rsive
.
h to
LIB_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: enable
SNPRIN
T
F_RETURNS_BOGUS
f
or HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
i
k
l
os Vajna
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos Vajna
t93
0
0: replace '!' wi
t
h te
s
t_mu
s
t
_
fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation: doc
u
me
n
t th
e
pag
e
r
.
* configuration set
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos V
a
jna
t7
6
01: extend the 'mer
g
e
p
i
c
ks up the
bes
t
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mi
k
l
o
s
V
a
j
n
a
bu
i
ltin-mer
g
e: give a proper erro
r
message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Te
a
ch 'git merge' that
s
ome
m
erge strateg
i
es no l
o
nger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Va
j
na
A
d
d a new test for git-mer
g
e-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
t
6021: add a new test for git-
m
erge-res
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
make remo
v
e-dashes: apply to
s
c
r
ipts and pr
o
grams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
g
i
t-bisect: use dash-
l
ess
f
o
r
m on git bise
c
t log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
t1
0
07-hash-object
.
sh: use qu
o
tes for the
test descriptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
t0001-init
.
s
h
:
change confusi
n
g directory
n
ame
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos V
a
jna
Build in
m
e
rge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
V
a
jna
Fix t7601-merge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los
V
a
jna
git
-
co
m
mit
-
tre
e
: make it
usable fro
m
other bu
i
ltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Ad
d
new test case to ensu
r
e git
-
m
e
r
ge prepends
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-to-git:
u
se git init instead o
f
git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-git: rewrite
"
git
-
frotz"
to "gi
t
frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
h
g-to
-
gi
t
: abort if the proje
c
t directory i
s
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-
t
o-git
:
avoid raising a st
r
ing exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
n
a
IN
S
TALL:
U
pdate s
e
ction ab
o
ut git-f
r
o
tz fo
r
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos V
a
jna
R
e
tire
'
stupid
'
merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajn
a
Add new test case to e
n
sure git-merge
r
educes oc
t
o
p
u
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
e
w test to ensure
git-m
e
r
ge handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
I
n
troduc
e
get_octopus_merg
e
_bases()
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merg
e
-msg: mak
e
it u
s
abl
e
from other
bui
l
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move read_
c
ache_unmerged() t
o
read
-
cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add new test
t
o
ens
u
re
g
it-m
e
rg
e
handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
a
j
n
a
Move parse-op
t
ions's skip_p
r
e
fix()
t
o git-compat
-
util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
M
o
v
e commit_l
i
s
t
_
c
ount() to
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e spl
i
t_cmdline
(
) to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajna
path-list do
c
umentation: do
c
ument
all fu
n
ctions
a
nd
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
run-com
m
a
nd doc
u
mentation: fix "memset()" parame
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
gi
t
-r
e
ad-tr
e
e: document -v
o
pt
i
on
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vajna
A simple
s
cript to
p
arse the resul
t
s from the testca
s
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
o
s
Vajna
g
it-rebase -i: me
n
tion
the
s
hort
c
o
m
mand aliases i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
Remove u
n
use
d
code in parse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strb
u
f d
o
cumentation:
d
ocu
m
e
nt most
functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos Vajna
Revision wa
l
ki
n
g
documentatio
n
: document mo
s
t im
p
ortant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los
V
ajna
Cod
i
n
g
G
u
ideli
n
e
s
: Add
a
note to
avoid assignment
s
insi
d
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mik
l
os V
a
jna
git-me
r
ge: exclud
e
unnec
e
ssary options from OP
T
I
ONS_SPE
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
Vajna
git-fast-import: rename
c
md_*() functi
o
ns to pars
e
_
*
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vaj
n
a
INSTALL: add
a note abo
u
t GNU inte
r
act
i
ve t
o
ols h
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klos Vajn
a
Add tes
t
s for sendemail
.
cc configuration variabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s
Vajna
g
i
t-s
e
nd-e
m
a
i
l
:
add
a
n
ew sendemail
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
a
jna
git-format
-
p
a
tch:
add a new fo
r
m
at
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git che
c
kout:
add -
t
a
l
ias
f
o
r --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
los Vajna
diff options documentation:
r
e
fer to --d
i
ff-
f
il
t
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contrib/hooks: add an example pre-au
t
o-gc
ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
Docu
m
entati
o
n/hooks
:
add pr
e
-auto-g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
k
l
os Vajna
git-gc --a
u
to
:
add pre-a
u
to-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klos Va
j
na
Documentation/git-merge:
docu
m
en
t
s
u
btree
strate
g
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
ikl
o
s
V
ajna
git-gui
:
U
pdated Hungari
a
n tran
s
lation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
M
i
k
los Vajna
U
p
d
at
e
Hun
g
arian transla
t
ion
.
100% com
p
l
e
t
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
I
m
pr
o
ve
t6029 to
check the real "subt
r
ee" cas
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Va
j
na
D
oc
u
mentation/git svn l
o
g:
a
dd a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
M
i
kl
o
s
Vaj
n
a
Docu
m
entatio
n
/git-filter-branch: a
d
d
a new
ms
g
-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean
:
handle errors
i
f removing files fai
l
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
M
i
klos Vajna
Documentation/git-sta
s
h:
do
c
ument options for git s
t
a
sh
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mi
k
los Vajna
g
i
t clone -
s
documen
t
a
tion: f
o
rce a
new
para
g
r
a
p
h for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
i
klos Vajna
buil
t
in-gc
.
c: g
u
ard config
p
arser from
va
l
ue=
N
UL
L
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
i
klos Vajna
g
i
t rev-parse manpage:
s
pelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
ajna
git
pull m
a
npage:
d
on't include -n from fet
c
h
-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Mi
k
los Vajna
git-cl
o
n
e -s: document
probl
e
ms with g
i
t gc -
-
p
rune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Includ
e
rev-
l
i
s
t optio
n
s
i
n
g
i
t-log
manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mikl
o
s
Vajna
ls-
r
emote: add -t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
M
i
k
l
os Vaj
n
a
Add u
s
in
g
me
r
ge
s
u
b
t
ree How
-
T
o
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
M
i
k
los V
a
jna
t/t7001: avoid unneces
s
ary ERE wh
e
n
u
sing grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git
-
sh-s
e
tup: documen
t
git_ed
i
tor() and get_a
u
thor_ide
n
t
_f
r
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
l
os Vajna
everyday: replace 'prune' a
n
d 'repac
k
' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
los Vajna
U
p
d
ate H
u
ngarian tran
s
lation
.
10
0
%
comple
t
e
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mik
l
os Vajna
Include d
i
ff o
p
tions in the
git-log m
a
n
p
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos V
a
jna
g
it-send
-
e
mail: add a new sende
m
ail
.
to configurati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mikl
o
s Vajna
git stash
:
d
ocument a
p
p
ly's --ind
e
x
s
witch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vaj
n
a
git
-
bu
n
dle: fix
commandline
examp
l
es
i
n the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Mikl
o
s Vaj
n
a
Use
r
M
a
n
u
a
l
:
add
a chapter f
o
r submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungar
i
an translation of
g
it-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
i
k
l
o
s Vajna
gitweb:
n
ew cgi pa
r
ameter
:
op
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vaj
n
a
gitweb
:
pref
e
r git_g
e
t
_
project_o
w
n
e
r(
)
over get
_
fi
l
e_
o
wner
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Vajna
D
o
cumen
t
-
<n> for git-forma
t
-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree