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
Sync with 2.30.9
2013-07-02
Miklos Vajna
merge:
h
andle --ff/--no
-
ff/--ff-only a
s
a tri-state
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2013-04-11
Miklos Va
j
na
c
herry-pick: make s
u
re
all in
p
ut obj
e
cts ar
e
commits
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-09-14
Mik
l
os Vajna
che
r
ry-pick
:
d
o
n
't f
o
rget -
s
on f
a
ilure
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-08-17
M
ik
l
os Vajna
man: git
pull -r is
a
short for --rebase
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-06-19
Miklos Vajna
Do
c
u
m
entation: s
p
ell
i
ng fi
x
es
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-07-13
Miklos
V
ajna
form
a
t-patch: document the for
m
a
t
.
to
c
onfiguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
M
i
kl
o
s Vajna
request-p
u
l
l
:
avo
i
d
men
t
i
oning that the start point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
M
i
k
l
o
s Vajna
gitk: Up
d
ate Hung
a
rian tr
a
nsl
a
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
M
iklos Vaj
n
a
Documen
t
date f
o
rmat
s
accepte
d
by parse_date()
commit
|
commitdiff
|
tree
2009-12-03
Miklos V
a
jna
builtin-commit: a
d
d --date option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos Vajna
git-st
a
sh docum
e
ntation: menti
o
n
d
e
fa
u
lt options for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Mi
k
los Vajna
gi
t
b
r
a
nch -D
:
g
i
ve a b
e
tter err
o
r message
wh
e
n lockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Miklos Vajna
g
i
t
-c
l
one: add
missin
g
comma in --r
e
f
e
rence document
a
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Mik
l
o
s
V
ajna
h
g
-to-git: don't
i
mp
o
r
t
the unused popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos
V
ajna
g
it-submodule docum
e
ntation: f
i
x
f
o
reach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
g
i
t-s
v
n d
o
cumen
t
ation: fix typo in 'reb
a
se vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajn
a
refs: use war
n
ing() instead of fp
r
intf(stderr,
"
war
n
ing: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos
V
a
jna
builtin-show-re
f
: use w
a
r
ning() instead of
f
printf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajn
a
builtin-sh
o
w-bra
n
ch: use warning() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos Vajna
buil
t
in-rm: u
s
e warn
i
ng
(
) instea
d
o
f
fprintf(std
e
rr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klo
s
Va
j
na
builtin-init-db:
u
se warning()
i
n
s
t
ead of fpr
i
ntf(
s
td
e
rr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bu
i
l
t
in-fetch-pack:
u
se warn
i
ng() inste
a
d o
f
fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
bu
i
ltin-checkout: use warni
n
g() instead of f
p
rintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos
Va
j
n
a
b
u
iltin-apply: use warni
n
g() i
n
stead
of fp
r
intf
(
stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http
-
push: using err
o
r() and
w
a
r
ning() as
a
pprop
r
iate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos
Va
j
n
a
Tests: use test_cm
p
instead
o
f diff wh
e
re possi
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vaj
n
a
parse-opt:
migrate bui
l
tin-ls
-
files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gi
t
tutoria
l
:
remov
e
misl
e
ading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Va
j
na
Make t3411
exec
u
table
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
M
iklos Vajna
fast-ex
p
ort:
print usage when no opti
o
ns specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
par
s
e-opt
:
migrate
builtin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
M
i
klos
V
a
j
na
t9129:
s
kip the last three tests
if UTF-8 loca
l
e is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos V
a
j
n
a
Submitting
P
atches: me
n
tio
n
the u
s
age o
f
real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos Vajna
gith
o
oks documen
t
ation: add a note a
b
out the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s Vajna
git-daemon documentation
:
use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
i
klos Vajna
Add support f
o
r a pdf vers
i
on of t
h
e user
m
anual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
iklos Vajna
g
i
t-gu
i
: Up
d
at
e
H
u
ngarian trans
l
atio
n
for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c: use
'
git
_
config_st
r
ing' to get 'curl
_
http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
sub
m
odu
l
e:
u
s
e
git
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
rebase: use g
i
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull
:
use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
lost-fo
u
n
d: u
s
e git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
f
i
lter-branch: u
s
e
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
git-st
a
sh: us
e
git
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mi
k
los Vajna
User's Manual:
remove dup
l
icated url at the end
o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
b
uiltin_clone: use strb
u
f
i
n
c
md_c
l
o
ne
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mik
l
os
Vajna
bu
i
ltin-cl
o
ne: use strbuf in clone_local() and copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
bu
i
ltin-clon
e
: us
e
strbuf in guess_dir
_
name
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mikl
o
s Vajna
Add new testc
a
se
to s
h
o
w
fast-expo
r
t
does not alw
a
ys
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajn
a
builtin-bran
c
h: use
s
t
rbuf in
r
e
n
ame_
b
ranch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajna
builti
n
-branc
h
:
u
s
e
s
trbuf in fill_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajna
b
uiltin-branc
h
: use st
r
buf in
d
elete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
k
los Vajna
U
p
d
ate Hu
n
garian translation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote: documen
t
the m
i
gration featur
e
of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
los
V
ajna
git-remote r
e
name: migrate from remote
s
/ and b
r
anc
h
es/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
re
m
ote: add a new
'origin' v
a
ri
a
ble
t
o
the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos
V
a
j
na
Impl
e
ment g
i
t remote
rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
i
k
l
o
s Vajn
a
upd
a
te-ref --no-deref -d: handle t
h
e cas
e
when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklo
s
Vajna
git b
r
anch -m: forbid renamin
g
of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
Fix git update-ref --no-der
e
f -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
a
jna
rename_ref():
h
andle t
h
e c
a
s
e when the reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vaj
n
a
Fix git branch -
m
for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos V
a
jna
parse-opt: m
i
grat
e
builtin
-
checko
u
t-in
d
ex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Va
j
na
Add te
s
tcase
t
o ens
u
re merging an early par
t
of a b
r
anch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linux PPC support to
t
h
e
pre-auto-
g
c e
x
ample hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-lib: fi
x
c
o
l
o
r r
e
set in say_color
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajn
a
I
m
plement git cl
o
n
e
-v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s Vajna
C
leanup in sh
a
1_file
.
c::cache_or_un
p
ack
_
entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
buil
t
in-commit: us
e
reduce_heads(
)
only when appro
p
ri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin
-
merge: re
f
resh t
h
e
index befor
e
c
alling
a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
t7603
:
add new testcases to ensu
r
e
builtin
-
commi
t
uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
j
n
a
builtin-
c
om
m
i
t
: u
s
e co
m
mit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
n
a
commit_tre
e
(): add a ne
w
author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
lo
s
Vajna
t7501: always use test_cmp ins
t
ead of
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
built
i
n-merge
:
re
l
ease the lockfile
in try_m
e
rge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os
V
ajna
merge-recu
r
sive: get rid of virtu
a
l_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-rec
u
rsive: move cu
r
rent_{f
i
le,
d
irectory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recu
r
sive: move the
g
lobal obuf to struct
mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s
Vajna
merge-recurs
i
ve: get
rid of t
h
e ind
e
x_onl
y
global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
me
r
ge-recurs
i
v
e
: move call_dept
h
t
o struct merge_opti
o
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
Make
f
ile: add merge_re
c
ursive
.
h to
LI
B
_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Vajna
cherry
-
p
i
ck
/
revert:
m
ake direct intern
a
l call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
built
i
n-mer
g
e: avo
i
d
run_
c
ommand_v_opt() for recurs
i
v
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
merge-recursive:
i
n
t
roduce me
r
ge_o
p
ti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
Split o
u
t merg
e
_recursi
v
e() to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklo
s
Vajna
Makefile: enable S
N
PRINTF_RETURNS
_
BOGUS for
H
P-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mik
l
os
Va
j
n
a
Fix 'git help hel
p
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajn
a
t9300: replace '!' with test_
m
ust
_
f
a
il
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation: document t
h
e pager
.
* configuration sett
i
ng
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os Vajna
Builtin git-
h
e
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajn
a
bui
l
tin-help: always loa
d
_co
m
mand_li
s
t(
)
in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
Add
a s
e
cond test
c
ase for han
d
ling invalid strategie
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
l
o
s Va
j
na
Add a
n
ew test for usi
n
g a cust
o
m
m
erge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Va
j
n
a
b
u
iltin-merge: allow using a custom s
t
r
a
te
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los
Vaj
n
a
builtin-
h
elp:
m
a
k
e some internal
funct
i
on
s
availabl
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
ajna
t76
0
1: extend the 'merge pi
c
ks u
p
the
be
s
t result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klo
s
Vajna
builtin-merge:
gi
v
e a prope
r
error message
f
or invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teac
h
'git m
e
rge' that
som
e
m
e
rge strategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklo
s
Vajna
Add
a
new test fo
r
g
it-m
e
rge
-
r
e
s
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t602
1
: add a
new t
e
st for git-merge-res
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next