repo.or.cz
/
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 'ph/pull-rebase-detached' into maint
2012-09-14
Miklos
V
ajna
che
r
ry-pick
:
don't forget -s on failure
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-08-17
Miklos Vajna
man: git pull -r is a short
f
or --rebase
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-06-19
Miklos
V
ajna
D
ocumentation
:
spelling fixes
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vaj
n
a
format-patch: doc
u
m
e
nt the format
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vaj
n
a
request-
p
u
ll: avoid mentionin
g
that
t
he
start p
o
int
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
M
iklos Vajna
gitk: Update Hun
g
arian t
r
anslation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
M
i
klos Vajna
Do
c
umen
t
date formats
a
ccepted b
y
parse_date()
commit
|
commitdiff
|
tree
2009-12-03
Miklo
s
Vajna
bui
l
ti
n
-c
o
mmit: add --dat
e
option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos V
a
jna
git-sta
s
h
d
ocumentation:
me
n
t
ion
d
e
fault op
t
ions f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Miklos Vajna
git br
a
nc
h
-D: g
i
ve a better error mess
a
ge when lo
c
kf
i
le
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Mik
l
os Vajna
git-clo
n
e: add missi
n
g
com
m
a
i
n --reference documentation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Vaj
n
a
hg-to-
g
it: do
n
'
t
i
m
port th
e
u
n
used pop
e
n2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajna
git-subm
o
dule d
o
cumentation
:
fix f
o
reach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
git-sv
n
docume
n
tat
i
on:
f
ix typo
i
n
'rebase
vs
.
p
u
l
l
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
re
f
s: use warning
(
) instea
d
of fp
r
intf(stde
r
r, "warning
:
"
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
builtin-show-r
e
f:
u
se
warnin
g
() instea
d
o
f fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
ikl
o
s Vajna
b
u
i
ltin-show-branch: use warning() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
bu
i
ltin-rm: use war
n
ing() i
n
stead of fp
r
intf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
k
l
o
s Vajna
builtin-in
i
t-
d
b: use warn
i
ng() instead of f
p
rintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajn
a
b
u
iltin-fet
c
h
-
p
ack: us
e
w
ar
n
ing() in
s
tead of fprin
t
f
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
builtin-ch
e
ckout: us
e
war
n
ing() instea
d
of f
p
rintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
builtin
-
apply: use w
a
rning() inste
a
d
of fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
ht
t
p-push:
u
sing erro
r
()
a
nd w
a
r
ning() as app
r
opriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Tests: use t
e
st_
c
m
p
in
s
tead o
f
diff whe
r
e
possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mikl
o
s Vajna
parse-
o
p
t: migrate builtin-ls-f
i
les
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
M
iklos Vajna
gi
t
tutorial: remov
e
m
isleading
no
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos V
a
j
n
a
Mak
e
t3411 executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-exp
o
rt
:
print
usage when no op
t
ions sp
e
cified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Mikl
o
s Vajna
parse-o
p
t: migrate builtin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t
912
9
: s
k
i
p the last three tes
t
s
i
f
UT
F
-8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
Su
b
mitting
P
atche
s
:
mention t
h
e usage of
r
eal name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos V
a
jna
githooks d
o
c
ume
n
tat
i
on: add a note about t
h
e +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
gi
t
-
d
aem
o
n document
a
tion
:
u
se
{
t
ilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vajna
Add suppor
t
for a pdf v
e
r
s
io
n
of the user
m
a
nual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
iklos Vaj
n
a
git-gui:
Update Hung
a
rian translatio
n
f
o
r
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos V
a
j
na
http
.
c
: use 'git
_
c
o
nfig
_
s
t
ring' to g
e
t
'
curl_htt
p
_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajn
a
submodule: use git r
e
v-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Va
j
na
rebase:
u
se
g
it
r
ev-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull
:
u
se
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost-found: use
g
it
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-
b
ranc
h
: use
g
i
t rev-parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos Vajna
git-stash:
u
se gi
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklo
s
Vajna
User's Manual: re
m
ove duplicated url
a
t
the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vaj
n
a
bu
i
ltin_clone: use
strbuf in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
jna
bu
i
ltin-clone: use strbuf in cl
o
ne_local() and copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajn
a
built
i
n-clone: use st
r
b
u
f
in
g
uess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Add
new
testca
s
e to
show fast-export
does not a
l
ways
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch: use
s
trbuf in
re
n
ame_branc
h
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Vajn
a
builtin-branch:
u
se strbuf in fill_tr
a
ck
i
n
g
_i
n
f
o()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch: use strbuf in
de
l
ete_
b
ranches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
k
l
o
s
Vajna
Update H
u
ngaria
n
transl
a
tion
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
g
it-remote: do
c
ument the m
i
gration
f
eature of
the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vaj
n
a
git-r
e
m
o
te rename: m
i
gr
a
te from
r
emotes/ a
n
d branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
remote: add
a
n
ew 'origin'
v
a
riable to t
h
e
struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Im
p
l
e
ment git
r
emote ren
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vaj
n
a
update-
r
ef --no-deref -d: handle the
c
a
se when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos
V
ajna
g
it branc
h
-m: f
o
rbid renamin
g
of a
symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
ikl
o
s Vajna
Fix git update
-
r
e
f --no-de
r
ef -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los
V
ajna
rename_ref
(
): handle the case when the r
e
flog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
ajna
Fix git br
a
nch
-
m for symr
e
fs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
p
a
r
s
e
-opt: migra
t
e b
u
i
lt
i
n
-
c
h
e
c
k
out-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add te
s
tcase
t
o ensure merg
i
ng an early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vaj
n
a
Add Linux PPC support to
t
he p
r
e-auto
-
gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
iklos Vajna
t
est-lib: fix colo
r
rese
t
in say_color
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Implement
g
it
c
lone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Clea
n
up in sha1_file
.
c::cache_
o
r_un
p
ack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
b
u
iltin-commit: use reduce_
h
eads() only
when a
p
prop
r
i
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos V
a
jna
b
u
iltin
-
merge:
r
e
fresh the index before callin
g
a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add new testcases to ensure builtin-c
o
mmit use
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
b
uilti
n
-commit: use commit_
t
r
e
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commi
t
_tree(): add
a
new a
u
th
o
r
param
e
ter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
t
7501: always
u
se t
e
st_cmp
i
nstead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
built
i
n-merge
:
re
l
ea
s
e
the lockfile in t
r
y_me
r
g
e_s
t
rate
g
y()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
Vaj
n
a
merge-r
e
cursive: get rid
of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-re
c
ursive: move curren
t
_{f
i
le,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s V
a
j
na
merge-r
e
cur
s
ive: move the global obuf
to
s
truct mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
m
e
rg
e
-recu
r
s
i
v
e
: get r
i
d o
f
the i
n
d
e
x_only global v
a
riable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
mer
g
e-recurs
i
ve: move ca
l
l_depth to s
t
ruct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos
Va
j
na
Make
f
ile:
add m
e
r
ge_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mikl
o
s
V
ajna
c
herry-pick/revert: mak
e
d
i
rect internal call
to merge_
t
ree()
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
b
u
iltin
-
m
e
rg
e
: avo
i
d run_command_v_opt() fo
r
recur
s
ive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recur
s
ive:
i
ntrod
u
ce
merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Sp
l
it o
u
t
m
er
g
e_recursive() to m
e
r
g
e
-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
iklos Vajna
Makefi
l
e: enable S
N
PRINTF_RETUR
N
S_BOGUS for HP
-
UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
los Vajna
Fix 'git help he
l
p'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vaj
n
a
t
9
300:
r
e
plac
e
'
!' with test
_
must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation: docu
m
ent the pager
.
* configuration se
t
ting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
ikl
o
s
Vajna
B
u
iltin
g
it-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-h
e
l
p
: alw
a
ys load_
c
ommand_
l
ist() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d a se
c
ond test
c
a
s
e
for han
d
ling invalid st
r
a
t
egies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
Add a new test for using a custom
m
e
r
ge stra
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
built
i
n-merge
:
all
o
w using a
c
ustom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
l
os Vajna
built
i
n-h
e
lp: make som
e
internal functions a
v
a
i
labl
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajn
a
t7601
:
extend the 'merge
p
i
c
ks up
t
he b
e
s
t
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
V
ajna
builti
n
-
merge: giv
e
a
p
roper error message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git merge' that some m
e
rge
s
trategies no lo
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
Add a new te
s
t fo
r
git-me
r
g
e
-re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a
new test fo
r
git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-da
s
hes: ap
p
l
y t
o
s
cripts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
l
o
s Va
j
na
git-bi
s
ect: use dash-less
f
orm o
n
g
i
t
bi
s
ect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next