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 'jc/diff-merge-base-multi'
2010-07-13
Miklo
s
Vajna
f
ormat
-
patch: documen
t
the format
.
to configur
a
t
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vajn
a
re
q
uest-pull: avoid me
n
tio
n
ing th
a
t
the start p
o
int
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Mikl
o
s
Vajna
gitk
:
Update Hungar
i
an translation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajn
a
Document date form
a
ts accepted b
y
p
ars
e
_
d
a
t
e()
commit
|
commitdiff
|
tree
2009-12-03
Miklos
V
ajna
builtin-commit
:
add --
d
ate option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos Vajn
a
git-stash documen
t
ation:
m
e
ntio
n
default options f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
M
i
klos Vajna
git bra
n
ch
-
D: give a better error message when lockfil
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
M
i
k
l
os Vajn
a
git-clone: add
missing comma
i
n --ref
e
re
n
ce do
c
u
mentat
i
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Vajna
hg-
t
o-git: don
'
t import the unus
e
d popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Mik
l
o
s
Vajna
g
it-submodule doc
u
men
t
ation:
fix foreac
h
examp
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos
V
ajna
git-
s
vn do
c
umentation
:
fix typo in 're
b
a
se vs
.
p
u
ll
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
r
e
fs: u
s
e warnin
g
(
)
i
n
stead of fp
r
intf(stderr, "
w
arning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
buil
t
in-s
h
ow-ref:
use warnin
g
() instead
o
f fpr
i
ntf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
bu
i
ltin-
s
h
o
w-branch: use
w
a
r
ning
(
) ins
t
e
ad of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
k
los Vajna
b
u
i
ltin-rm: us
e
warni
n
g() instead of fprin
t
f(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-init
-
db: use warning(
)
instead o
f
f
prin
t
f(
s
tderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-fetch-pack: use
warning() instead of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-checkout: use
w
ar
n
ing() instead of fp
r
intf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
k
los Vaj
n
a
builtin-a
p
ply: use war
n
ing() ins
t
ead
of fprintf(st
d
er
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http-push: using erro
r
() and warning() as appropri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos
V
ajna
Te
s
ts: use test
_
c
m
p instea
d
of
diff where
possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
M
iklos Vajna
parse-o
p
t: migrate b
u
iltin-ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos
V
a
j
na
git
t
uto
r
ia
l
: remove misleading no
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Mikl
o
s Vajna
Make t3411 executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos V
a
jna
f
a
st-export: print us
a
ge when no
o
p
tions spe
c
ified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklo
s
Vajna
parse-opt: m
i
g
r
ate bu
i
l
tin-a
p
ply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t9129: s
k
ip the last three tests i
f
UTF-
8
local
e
i
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mik
l
os Vajn
a
S
ubmittingPatches: mention the usage
o
f rea
l
na
m
e in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks documentat
i
on
:
add
a
note about t
h
e +x
m
ode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemo
n
documentati
o
n:
use {ti
l
de}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
i
klos Vajna
Add support for a pdf version of
th
e
u
s
e
r m
a
nual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
i
klos
V
aj
n
a
git-gui: U
p
date Hungar
i
an translation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vaj
n
a
http
.
c: use
'
g
i
t_config_
s
trin
g
'
t
o get 'curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
l
o
s
Va
j
na
submodu
l
e: use
g
it rev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
rebase: use git
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
p
u
ll: use git r
e
v-parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajn
a
l
ost-found: use git re
v
-
p
ar
s
e
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
filter-br
a
n
c
h: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os
V
ajna
git-stash: use git rev
-
pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos
V
ajna
User's Manual: remo
v
e duplicated url at the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mikl
o
s Vajna
built
i
n_clone: us
e
strbuf in
c
md_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
j
n
a
built
i
n-clon
e
: us
e
strbuf in clone_l
o
c
al()
a
nd cop
y
_
or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mikl
o
s V
a
jna
builtin-clone: use s
t
rbu
f
in guess_d
i
r_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos V
a
jna
Add
n
e
w
t
e
s
t
case to show
fast-ex
p
ort
does not alwa
y
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
uiltin-branc
h
: use strb
u
f in
renam
e
_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
ui
l
tin-b
r
anch: use strbuf in fill_tracking_inf
o
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Vajna
builti
n
-branch: use strbu
f
in de
l
e
te_bra
n
ches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Va
j
na
Update Hunga
r
i
an translation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote
:
do
c
ument the migration f
e
ature of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-rem
o
te rename: mig
r
at
e
from remotes/ a
n
d
b
ra
n
che
s
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
remote: add a ne
w
'origin' var
i
able to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
i
klos Vajna
Implement g
i
t remote renam
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
iklos Vajna
updat
e
-
r
ef --
n
o-deref -d: hand
l
e the case wh
e
n the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
g
i
t
bran
c
h -
m
: forbid rena
m
in
g
of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git up
d
ate-
r
ef -
-
no-der
e
f -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
Vajna
r
e
name_
r
ef
(
): handle the case when t
h
e
reflog o
f
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os V
a
jna
Fix git branch -m
f
or symre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Va
j
na
parse
-
opt: migrate
b
ui
l
tin-checko
u
t-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Va
j
na
Ad
d
t
e
stcase t
o
ensure merging an early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos V
a
j
na
Ad
d
Lin
u
x
P
PC support to t
h
e pre-a
u
to-gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mikl
o
s
V
ajna
test-lib: f
i
x color re
s
et in say_
c
o
l
or()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Impleme
n
t git cl
o
ne -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos V
a
jna
Cleanup in sha1_
f
ile
.
c::cache_or_unpack_entry(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
los Va
j
na
builtin-com
m
it
:
use reduce_hea
d
s() o
n
ly w
h
e
n
a
pprop
r
iat
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
buil
t
in-mer
g
e: re
f
resh the index before cal
l
ing a
strat
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
t
7603: add new testca
s
es to ensure builtin
-
c
o
mmit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
built
i
n-com
m
i
t
:
use commit
_
tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree(): add
a ne
w
aut
h
o
r
p
a
rameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
t7501
:
alwa
y
s use
t
est_cmp instead of
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
b
u
iltin-merge:
r
eleas
e
th
e
lockfi
l
e in tr
y
_
m
erge_s
t
rate
g
y()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos
Vajna
merge-recursive: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
m
e
rge-re
c
urs
i
ve: move current
_
{fil
e
,direct
o
r
y
}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
merge
-
recu
r
s
ive: move th
e
g
lobal obuf
t
o
s
truct merge_opti
o
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vaj
n
a
mer
g
e-r
e
c
u
r
sive
:
get rid of the index_
o
nly g
l
obal variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos
V
ajna
merge-rec
u
rsive: move call
_
depth to struct
m
e
rge_op
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
M
a
k
efile: add merge_re
c
ursiv
e
.
h
to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
Vajna
c
h
erry-pick/
r
ever
t
:
make
d
irect internal cal
l
to m
e
rg
e
_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los V
a
jna
built
i
n-merg
e
: avoid run_comm
a
nd_v_opt() fo
r
recurs
i
ve
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recursive:
intr
o
d
u
c
e
merge
_
optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
lo
s
Vajna
Split
o
ut merge
_
recursive() to
me
r
ge-r
e
c
u
r
sive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklo
s
V
ajna
Makefile: enab
l
e SNPRIN
T
F_RE
T
URNS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
jna
Fix
'git help
h
elp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
a
jna
t
9
300:
r
ep
l
a
ce '!' with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos Vajna
Documenta
t
io
n
: docu
m
ent the pa
g
e
r
.
* c
o
nfiguration
s
etting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
o
s
Vajna
Bui
l
tin
git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
u
ilt
i
n-help:
always load_command_list() in
cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajn
a
Ad
d
a second
testcase for ha
n
dling in
v
alid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a ne
w
test for
u
sing
a cust
o
m
m
e
r
ge
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os V
a
j
na
builtin-
m
e
r
ge
:
a
l
l
ow using a
custom
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
u
i
l
t
in-
h
elp: make some
i
nternal f
u
nct
i
ons available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklo
s
Vajn
a
t7601: extend the 'm
e
rge picks up
the best resu
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos Vajna
builtin
-
m
erge: give
a
proper error
m
es
s
age for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
V
ajna
Te
a
ch 'git
m
erg
e
'
t
hat some
merge stra
t
egi
e
s
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajna
A
d
d
a new
test for git-merge
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vaj
n
a
t
6
021
:
a
d
d a new test for
g
it-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove
-
dashes: app
l
y
t
o scripts and
pr
o
grams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git
-
bisect: use dash-less form on git bis
e
ct
lo
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
o
s
Vajn
a
t
1
0
0
7
-hash-object
.
sh
:
use quotes
f
or t
h
e test d
e
s
cription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t0001-init
.
sh: ch
a
nge
c
onfusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Va
j
na
Buil
d
in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next