repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-svn documentation: fix typo in 'rebase vs. pull/merge' section
2009-06-21
Miklos Vajna
git-svn do
c
u
m
en
t
ation: fix
t
y
po
i
n 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mik
l
os
Vaj
n
a
Submi
t
ti
n
gPatches: men
t
ion
the usage of real nam
e
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
h
t
tp
.
c: use '
g
i
t
_
c
o
nf
i
g_string' to get
'curl_
h
ttp_p
r
oxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mikl
o
s
Vajna
U
s
er's Manua
l
:
r
emove d
u
plicated url at
the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
i
klos Vajna
Add
n
ew t
e
s
t
case t
o
show fast-ex
p
ort do
e
s no
t
always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
update-re
f
--no-deref
-d:
h
a
ndle the case
w
hen
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
i
klo
s
Vajna
g
i
t
branch -m: forbid rena
m
ing of a sy
m
r
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos V
a
jna
F
i
x git
u
pdat
e
-ref --
n
o-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
r
e
name_r
e
f():
h
a
ndle
t
he case w
h
en t
h
e re
f
log of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git b
r
anc
h
-m fo
r
s
y
mrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
k
los Vajna
A
d
d
t
est
c
ase to ensure m
e
rging an early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajn
a
t
est-lib: fix col
o
r
r
e
se
t
i
n say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
t7501: a
l
w
ays use
tes
t
_cmp instead
o
f diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
Makefi
l
e: add
merge_recursive
.
h to L
I
B_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Vajna
Makefile: enabl
e
SNPRINTF_
R
ETURNS_BOGUS
f
or HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
ajna
Fix '
g
it help
h
el
p
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: r
e
place '
!
' with test_must_fa
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
V
a
j
n
a
D
o
cumenta
t
ion:
document the pager
.
* c
o
n
f
ig
u
ration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
a
jna
t7601: extend the 'm
e
rge picks u
p
the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
V
ajna
b
ui
l
tin-
m
erge: gi
v
e
a
proper error
m
essage
for
i
nvalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os Vajna
Teach 'git merge' that some merge strateg
i
es
n
o
lo
n
g
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
A
dd
a
new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t
6021
:
ad
d
a new test
for
g
it-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
make
r
emove-d
a
shes: apply to scripts
a
nd p
r
ograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
git
-
bisec
t
: use dash
-
less form
o
n
git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t
1
007-h
a
s
h
-object
.
sh: use
q
u
otes f
o
r the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
o
s
Vajna
t0001-
i
nit
.
s
h
:
c
hange confu
s
in
g
direc
t
ory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bu
i
l
d
in merg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fi
x
t7601-merge
-
pul
l
-co
n
fig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
g
it-commit-tree: mak
e
it usab
l
e fr
o
m o
t
her
b
uilti
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
d
d
new test case to ensure git-merge prepends
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos
Va
j
na
hg-to-git: us
e
git init instead
o
f git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajna
hg-to-git: rewrite "git-fr
o
tz" to "git fr
o
tz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: abort if the project direc
t
o
ry is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-
t
o-git
:
avoid raising
a
string
e
xcep
t
i
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
INSTALL:
U
pdate section
about git-f
r
otz f
o
rm
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mikl
o
s Vajna
Retir
e
'stupid' merge strate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
A
d
d
n
ew
t
est case to ensure git-merge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test to e
n
s
ure git-
m
erg
e
ha
n
dles
m
or
e
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s Vajna
Introduce
get_o
c
topus_
m
erge_bases() in co
m
mit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: make it
usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os Va
j
na
Move
r
ead_cach
e
_u
n
m
erged() to rea
d
-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
j
n
a
A
d
d new
test t
o
ensure git-merge handles pull
.
twohe
a
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move pars
e
-
options's ski
p
_prefix
(
) to gi
t
-compa
t
-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Vajna
Mo
v
e commi
t
_list_count
(
)
to commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cmd
l
i
n
e
() to
a
lias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mikl
o
s
Vaj
n
a
path
-
list documenta
t
i
on
:
documen
t
all func
t
ion
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vaj
n
a
run-c
o
mm
a
nd
d
o
c
u
mentation: fix "memset()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
gi
t
-
r
ead-tree
:
docu
m
en
t
-v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
A simple script t
o
parse th
e
resul
t
s from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
git-rebas
e
-i: m
e
n
tion the short command aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove unused code i
n
parse_commit_buff
e
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
Vajna
Strbuf docu
m
entation:
d
ocument mo
s
t f
u
nctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision walking documentation: document most importan
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
iklos Vajna
CodingGuidelines: Add a
note to avoid
assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
i
klos Vajna
git-merg
e
: exclude
u
n
n
e
cessary options fro
m
OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklo
s
Vajna
git-fas
t
-import:
rename cmd_
*
() functions t
o
pars
e
_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
M
iklo
s
Vajna
IN
S
TALL: a
d
d a note about GNU interactive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
V
a
j
na
Add tests for
s
en
d
email
.
cc configurati
o
n
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-send-email: add a new
sendemail
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
V
a
jna
gi
t
-format-patch: add a new for
m
at
.
c
c
configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checkout: add -t alias
for -
-
track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os
Vaj
n
a
diff o
p
t
ions documentati
o
n: refer t
o
--diff-
f
ilter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os
V
aj
n
a
c
o
ntrib/ho
o
k
s
: add an example pre-a
u
to-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Documentation/hooks: add pre-auto-
g
c
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
ik
l
os Vajn
a
g
it-gc
-
-au
t
o: add pre-auto-gc hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos V
a
jna
Do
c
u
m
entation/git-merge: d
o
c
ument subt
r
ee s
t
r
ateg
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
los V
a
jn
a
git-gui: U
p
dated Hun
g
arian translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mi
k
los Vajna
U
pd
a
t
e
Hungarian t
r
anslati
o
n
.
1
00% comple
t
ed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklo
s
Vajna
Improve t6029 to check the re
a
l "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos
V
aj
n
a
Documentation/git svn lo
g
:
add a note about timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
D
ocumentation
/
git-filter-branch: ad
d
a new msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-c
l
ean: handle errors
i
f removi
n
g files fai
l
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos
V
ajna
Documen
t
ation/gi
t
-stash: docume
n
t options fo
r
git st
a
sh
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
a
jna
git clone
-s do
c
umentati
o
n: force a new paragra
p
h for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos
V
a
jna
built
i
n-
g
c
.
c
: guar
d
c
o
nf
i
g parser
f
r
om
val
u
e=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
os Vajna
git r
e
v-parse manp
a
ge: sp
e
lling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
los Vajna
g
i
t pull m
a
npage: d
o
n't inclu
d
e -
n
fr
o
m fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajn
a
git-
c
lone
-s:
document problems w
i
th git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
iklos Vajna
Inclu
d
e rev-li
s
t o
p
t
io
n
s in
g
it-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-re
m
o
t
e
: add -t
and -h
o
ptions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add us
i
ng
merge subtree
H
ow-
T
o
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Mikl
o
s Va
j
na
t/t7001: avoid
unne
c
essary ERE whe
n
usi
n
g
g
re
p
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mikl
o
s
Vaj
n
a
git-sh
-
s
e
tup
:
documen
t
git_ed
i
tor()
a
n
d g
e
t
_
a
u
t
h
or_id
e
nt_f
r
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
iklos Vajna
everyday: replace 'prune' and 'r
e
pack' w
i
th 'gc
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
U
p
d
ate Hu
n
garian translation
.
1
00% compl
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include diff options
i
n th
e
git-
l
og ma
n
pag
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
ikl
o
s Vajn
a
gi
t
-send
-
email: add a new sendem
a
il
.
to c
o
nfigura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash:
d
ocument apply'
s
--index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos
Vajna
git-
b
undle: f
i
x co
m
m
a
ndline examp
l
e
s
i
n
th
e
ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
V
ajn
a
U
se
r
M
a
nual: add a chapter
f
or submodul
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungarian translation of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
M
iklos V
a
j
na
gitweb: new
c
g
i
p
arameter: o
p
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos
Vajn
a
gitweb: prefe
r
git_
g
et_p
r
oject_owne
r
() o
v
er get_file_owner()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
M
i
k
l
os Vajna
Docu
m
e
n
t -<n> for git
-
format-
p
atch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree