repo.or.cz
/
alt-git.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
Miklos Vajna
git-svn docu
m
ent
a
t
ion: fix typo in 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
los Vajn
a
Su
b
m
i
ttin
g
Patche
s
:
m
e
ntion the u
s
age of real
n
ame
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c:
use 'git_config_string' to get 'curl_
h
ttp_
p
r
o
xy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mik
l
os Vajna
User's Manual: remov
e
duplicated url at the end
o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Add n
e
w
testcase to show fast-exp
o
rt does not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
i
klos
Va
j
na
update-ref --no-deref
-
d:
h
andle the
c
ase
when t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
iklos Vajna
g
i
t
branch
-m:
forbid ren
a
m
ing of a sy
m
ref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
kl
o
s Vajn
a
Fix git
u
p
d
ate-r
e
f --
n
o-d
e
ref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
ajna
rename_ref(): han
d
le the ca
s
e when the ref
l
og o
f
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajn
a
Fi
x
g
i
t branch -m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
A
dd testcase to ensure mergi
n
g an e
a
rly par
t
o
f a branc
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mik
l
os V
a
jna
test-
l
ib: fix co
l
or reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Va
j
n
a
t
7501: always use test_cmp instea
d
of di
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
los Vajna
Makefi
l
e: add merge_rec
u
rsive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Mak
e
file: enab
l
e SNPRINTF_RET
U
RN
S
_BOGU
S
for
H
P
-
UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Va
j
na
Fix 'git he
l
p help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mi
k
los Va
j
na
t9300:
repl
a
ce
'
!
' wi
t
h test_
m
ust
_
fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklo
s
Va
j
na
D
ocu
m
entation: docu
m
ent
t
he pager
.
*
c
o
nfi
g
u
ration
s
e
tti
n
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklo
s
Vajna
t
7601:
extend the 'merge picks up th
e
b
e
st result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
built
i
n-
m
e
r
ge: give a
proper err
o
r message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
i
kl
o
s
V
ajna
T
eac
h
'
g
it merge' th
a
t some me
r
g
e
s
trategie
s
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os
V
ajna
Add a new test f
o
r git-merge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
t60
2
1: add a new
test
for git-
m
e
r
g
e-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Va
j
n
a
m
ake r
e
mov
e
-
dashe
s
:
apply to sc
r
ipts
a
nd pro
g
rams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect
:
use
d
ash-les
s
f
or
m
on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
l
os Va
j
na
t1007
-
hash-object
.
sh: use quotes for the test descript
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-in
i
t
.
sh: change c
o
n
f
us
i
ng directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
uild in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t76
0
1-m
e
rge-pull-c
o
n
fig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
V
a
jna
git
-
c
o
mmit-t
r
e
e:
make it
usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Ad
d
new test
case to
ensure gi
t
-me
r
ge prep
e
n
ds the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-
t
o-git: use git init i
n
stead of gi
t
init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-
g
it: rewrite "git-frot
z
"
t
o "git
f
rotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajna
hg-to-git: abort i
f
the
p
ro
j
e
c
t directory
is not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jn
a
hg-t
o
-git: avoid
r
aising
a
s
tring exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
INST
A
LL: Update sect
i
on about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
R
etire
'
s
t
upi
d
' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new t
e
st
cas
e
t
o
en
s
ure gi
t
-merge reduces o
c
topu
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Ad
d
new te
s
t to en
s
u
re git-merge h
a
ndles more
t
han
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Va
j
na
In
t
r
o
d
u
ce
get_octopus_merge_ba
s
es(
)
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
j
na
g
i
t-fmt-merge
-
msg: make
it u
s
abl
e
from
other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vaj
n
a
Move read_cache_unmerge
d
()
to
read-ca
c
he
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Va
j
na
A
d
d ne
w
test to e
n
s
ure git-merge handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve parse-optio
n
s
's skip_prefix() t
o
git
-
com
p
at-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve commit_list
_
count(
)
to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Move
spli
t
_cmdline()
to al
i
as
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Va
j
na
path-lis
t
documentati
o
n
: d
o
cument al
l
func
t
ions
an
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
iklo
s
V
aj
n
a
r
u
n-command
d
o
c
umentation:
fix "me
m
set
(
)
"
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos V
a
jna
git-read-tree: do
c
ument -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Va
j
n
a
A
simple script to parse the results fro
m
t
h
e
testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Vajna
git-rebase
-
i: mention the shor
t
command aliase
s
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
aj
n
a
Rem
o
ve unu
s
ed code in parse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
S
t
r
b
uf documenta
t
ion: doc
u
me
n
t most functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
i
klos Vajna
R
e
v
is
i
on walking
d
ocumentation:
doc
u
ment most impor
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mik
l
os Vajna
Codi
n
gGuidelines: Add a note to avo
i
d assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
iklos Vajna
git-
m
erge: exclude unneces
s
ary o
p
t
i
ons from O
P
TIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-import: rename cmd_*() function
s
to p
a
rse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos V
a
jna
IN
S
T
A
LL:
a
dd a
n
o
t
e
a
bout GNU interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
Add tests for
sendem
a
il
.
c
c
config
u
rati
o
n variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
gi
t
-
send-email: a
d
d
a new sendemail
.
cc
c
onfiguratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los Vajna
git-f
o
rma
t
-pat
c
h: add
a
n
ew form
a
t
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checkout: a
d
d -t alias
f
or --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos
Vajna
diff options docum
e
ntation:
r
efer to
-
-diff-fil
t
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Va
j
na
contrib/hooks:
a
d
d an exam
p
le pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los Vajna
Docume
n
t
ation/
h
ooks: ad
d
pre-a
u
to-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
l
o
s
V
aj
n
a
git-gc
-
-
auto: a
d
d pre-auto-
g
c h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Doc
u
m
e
ntation/git-merge: document subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
iklos V
a
jna
g
it-gui: Updated Hunga
r
i
an translation
(e
5
fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mik
l
o
s
V
a
jna
Update Hungarian
t
ranslati
o
n
.
1
0
0%
c
o
m
pleted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t6029 to
check
t
h
e real "s
u
btree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Mik
l
os
V
ajna
Do
c
umentation/git
svn log: add a note a
b
out t
i
mezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documentation/git-filter-branch: add a new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean:
handle errors if r
e
moving files
f
ai
l
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mi
k
los Vaj
n
a
Documentation/g
i
t-stash: docu
m
ent options for git sta
s
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mik
l
os Va
j
na
git clone -s docum
e
nt
a
t
i
o
n: force a
n
ew pa
r
agraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
ikl
o
s Vajna
builtin-gc
.
c: gu
a
rd config
parser from
v
alue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Va
j
na
g
i
t rev-
p
arse manpage: spelling
fi
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git p
u
l
l
ma
n
page: don't include -
n
fro
m
fetch
-
option
s
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
i
klos Vajna
git-clone
-
s: d
o
cume
n
t probl
e
ms with git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mi
k
los
Vajna
Include re
v
-l
i
st
o
p
tions in git-log ma
n
p
a
ge
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-remote: add -t
a
nd
-h o
p
tions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mikl
o
s
Vajna
Add usi
n
g mer
g
e subtree
H
ow-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklo
s
Vajna
t/t70
0
1: avo
i
d unnecessary ERE when u
s
i
ng grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
M
i
klos Vajna
g
it-
s
h
-
setup:
docum
e
n
t
git_editor() and
g
et_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
iklos Vajna
ever
y
da
y
: replace 'prune' and 'repack' with
'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
klos Vajn
a
Update Hu
n
g
arian
translat
i
on
.
100% com
p
leted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
Includ
e
d
i
f
f
options in the g
i
t-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
g
i
t-send-email: add a
n
ew sendemail
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash: documen
t
a
pply's --index s
w
itch
commit
|
commitdiff
|
tree
2007-09-29
Mikl
o
s Vaj
n
a
git-bundl
e
: f
i
x commandline
e
xamples in t
h
e
manp
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
U
s
er Manu
a
l: add a chapter for submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian trans
l
ation of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos
Vajna
g
itweb: new cgi paramet
e
r: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitw
e
b: pre
f
er git_get_p
r
oj
e
ct_owner() ove
r
get_file_o
w
ner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos V
a
jna
Docu
m
e
nt -
<
n
>
for gi
t
-format-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree