repo.or.cz
/
git
/
mingw
/
4msysgit
/
wingit-dll.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' to sync with 1.6.0.1
2008-08-24
Miklos Vaj
n
a
Makefile: enable
SNPRINTF_RETU
R
N
S
_BOGUS
f
or HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklo
s
Vajna
Fix 'g
i
t help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mik
l
os Vajna
t9300: r
e
place '!' with tes
t
_
must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
Documentation
:
document th
e
pager
.
* conf
i
gurat
i
on
s
etting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: exten
d
the 'merge pick
s
up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s
V
ajna
builtin-merge: give a prop
e
r error
message
for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git m
e
rge' that some merge strategies no l
o
nger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Va
j
na
Add a new test
f
o
r git-merge-res
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
t6021: ad
d
a new tes
t
for
g
i
t
-
merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
make rem
o
ve-da
s
hes: apply to scripts
a
nd programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-b
i
sect: u
s
e dash-les
s
form o
n
g
i
t bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
a
jna
t100
7
-h
a
sh-object
.
sh: use quotes for th
e
test
d
escription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vaj
n
a
t
0
0
01-init
.
sh
:
change c
o
nf
u
sing
dire
c
tory
n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bu
i
ld
i
n
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
l
os Vajna
Fix
t
7601-merge-
p
ull-
c
onfig
.
sh on
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los
V
ajna
git-commit-tree: mak
e
it usable from other buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add ne
w
tes
t
case to e
n
sure git-merg
e
p
repen
d
s
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-git: use gi
t
i
n
it instead of
git i
n
it
-
db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g
-t
o
-
git: rewrite "git-frotz
"
to
"
git fr
o
tz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-gi
t
: abort if the pr
o
ject dir
e
ctory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to
-
git:
a
void
r
a
i
sing a st
r
ing exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
INST
A
LL:
U
pdate secti
o
n about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Ret
i
re 's
t
u
pid
'
merge str
a
tegy
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
A
d
d
new test case to ensure git-merge red
u
ces oc
t
opus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new
t
est to ensure
git-merge
handles m
o
re t
h
an
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Intr
o
duce ge
t
_octop
u
s_merge_base
s
() i
n
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-me
r
ge-msg
:
make
it usable from o
t
her b
u
iltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move r
e
a
d_cache_unmerged() to read-c
a
che
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new
t
est to ensure git-m
e
rge handles pull
.
twoh
e
ad
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos V
a
jna
Mo
v
e
p
ars
e
-opti
o
ns
'
s skip_prefix(
)
to git-com
p
a
t
-uti
l
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move comm
i
t_lis
t
_coun
t
(
)
to
com
m
it
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
M
o
ve split_cmdl
i
ne()
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 documen
t
at
i
o
n
: doc
u
ment
a
ll
functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command documentatio
n
: fix
"
me
m
s
e
t
()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
los Vaj
n
a
git-r
e
ad-tree: document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
A simple script
t
o parse th
e
results
f
rom t
h
e
t
estcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Va
j
na
git-rebase -i: mention the
s
hort command
aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove
unused code
i
n
par
s
e_co
m
mit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vajna
Strbuf
d
ocumentation:
docu
m
ent
m
ost
functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos
V
a
jna
Revisio
n
walking docu
m
entation: document most
i
m
p
or
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
los
V
a
j
na
Co
d
ingGuidelin
e
s: Add a
n
ote t
o
avoid assig
n
ments
insid
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
iklos
V
aj
n
a
g
it-merge: exc
l
u
de
unne
c
es
s
ar
y
o
p
tions from OPT
I
ONS_SP
E
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fast-import
:
rename c
m
d
_
*
(
) functi
o
ns to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: a
d
d a note
about GN
U
interact
i
ve
t
ools
h
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vaj
n
a
Add te
s
ts for se
n
demail
.
c
c confi
g
uration
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los Vajna
git-send-email: add a
n
ew send
e
m
ail
.
cc config
u
ra
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
ik
l
os
Va
j
na
git-form
a
t
-patch: add a
n
ew
format
.
cc confi
g
u
r
atio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
ik
l
os
Vajna
git checkout:
a
dd -
t
ali
a
s
for
--track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os Vajna
d
iff op
t
ions doc
u
menta
t
ion: r
e
fer to -
-
diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
contrib/hooks: add an exampl
e
pre
-
auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
Documentation
/
hooks: add pre-auto-g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos V
a
j
n
a
g
i
t-gc --a
u
to
:
ad
d
pre-auto-g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos
Vajna
Docum
e
ntation/g
i
t-merge: do
c
ument subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
i
klos Vajna
git-gui
:
Update
d
Hungarian translation
(e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vaj
n
a
Update Hungarian trans
l
ation
.
100% complet
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Im
p
rove t6
0
29
t
o
check the real
"
subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
klos Vajna
Docu
m
en
t
ation/git s
v
n
log: add a not
e
a
bout timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documen
t
a
tion/git-filte
r
-
b
ran
c
h: add a
ne
w
msg-fi
l
te
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vaj
n
a
g
i
t
-clean: handle
e
rrors if removing files
fail
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Documentatio
n
/git-stash: doc
u
ment optio
n
s for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mi
k
l
o
s Vajna
g
i
t
clon
e
-
s
doc
u
m
e
ntatio
n
: f
o
rce
a n
e
w paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin-
g
c
.
c: guard
config
p
arser from
v
alue=NU
L
L
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos
V
a
j
na
gi
t
rev-parse m
a
npage: spelling f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
kl
o
s Vajna
git pull ma
n
page: don't include -n from fetch-opti
o
n
s
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git-cl
o
ne -s: docum
e
nt problems with git gc --
p
r
une
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mi
k
los
V
ajna
Include rev
-
l
i
st op
t
i
ons i
n
g
i
t
-l
o
g
m
a
n
p
ag
e
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mi
k
los Vajna
ls-remote: add -t a
n
d -h
o
ptio
n
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add usin
g
merg
e
subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001: avoid unnec
e
ssary ER
E
when using
grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Va
j
na
git-s
h
-s
e
tup: document
git_e
d
itor() and get_
a
uthor
_
ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos
Vajna
ev
e
ryday: replace 'prune' a
n
d 'repack' with 'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
U
p
d
ate Hungarian
tr
a
nsla
t
ion
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
i
kl
o
s Vaj
n
a
Incl
u
de dif
f
options i
n
the git-
l
og m
a
n
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vaj
n
a
git-send-email: add
a
new
s
e
nd
e
mail
.
to
configura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
Vajna
git stas
h
: document ap
p
l
y's --in
d
ex swi
t
c
h
commit
|
commitdiff
|
tree
2007-09-29
Miklos
V
ajna
g
it
-
bundle: fix commandline
e
x
amp
l
es i
n
the manpag
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vajna
User
M
a
nual: a
d
d a chapter f
o
r
submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungaria
n
tra
n
slation
o
f git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Va
j
na
gi
t
web: new c
g
i
p
ara
m
eter: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
M
iklos Vajn
a
git
w
eb: prefer git_get_project_owner() over get_fil
e
_
o
w
n
e
r(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Miklos Va
j
na
Document -<n> fo
r
git-
f
ormat-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree