repo.or.cz
/
git
/
dscho.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/maint-template-permbits' into maint
2008-09-10
Miklos
Vajna
t
7
501
:
a
l
ways use test_cmp
i
n
stea
d
of
di
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Vajna
Ma
k
e
fil
e
:
add
m
erge_
r
ecursive
.
h to
LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
M
a
kefile
:
e
n
able SNPRINTF_RETURNS
_
BOGUS
for
H
P
-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
Vajn
a
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos V
a
jna
t9300
:
replace '!' w
i
th
test_must_
f
ail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docume
n
tation: document
t
he p
a
ger
.
* configura
t
ion s
e
t
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
Va
j
na
t7601: e
x
t
e
nd
the 'merge picks up the best res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a pr
o
per error
m
essage for in
v
alid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
T
each 'gi
t
merge' t
h
a
t some merge s
t
rategies
n
o longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
Add a
new
test
f
or git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
l
os Vajna
t6021: ad
d
a new test
for g
i
t
-
merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make
remov
e
-dashes: apply to scripts and p
r
o
grams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
git-bi
s
ect: use da
s
h-less form on git b
i
sec
t
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
l
o
s Vajna
t
1
00
7
-
hash-object
.
sh: use quotes for the
t
e
s
t des
c
ription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
V
a
jna
t0001
-
init
.
s
h: change confusin
g
director
y
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos V
a
jna
Build in
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
Fix
t
7601-merge-p
u
ll
-
co
n
fig
.
sh on
A
IX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tr
e
e
:
make it u
s
able
f
rom o
t
her
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Add new t
e
st cas
e
to en
s
u
re git
-
merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-git: u
s
e
git
init
i
nstead of gi
t
i
n
it-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git: rew
r
ite "git-fro
t
z
" to "git frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: ab
o
rt if the project director
y
i
s n
o
t a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-t
o
-gi
t
: avo
i
d
r
aising
a string
excep
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
l
os Vajn
a
I
NSTALL: Update section about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos Vajna
Retire
'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os V
a
jna
Add new te
s
t cas
e
t
o ensur
e
git-merge red
u
ces
octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test to ensure
git-merge handles more th
a
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos V
a
jna
Introdu
c
e get_
o
ct
o
pus_merge_bases() i
n
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klo
s
V
a
jna
git-fmt-merge-m
s
g: make it usable from oth
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move re
a
d_cache_unmerge
d
()
t
o read
-
c
a
che
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test to
e
nsure git
-
m
e
r
ge ha
n
dles
p
ull
.
twohea
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
kl
o
s
Va
j
na
Move parse-optio
n
s
'
s skip_pr
e
fi
x
()
to
git-co
m
pat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Va
j
na
M
ove commit_list_count(
)
to co
m
mit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
Vajna
Move split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklo
s
Va
j
na
path-
l
i
s
t
d
o
cum
e
nt
a
ti
o
n:
d
ocu
m
ent all f
u
n
ctions
a
nd
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-command documentation: fix "memset()" para
m
eter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Va
j
na
git-
r
ead-tree: doc
u
ment -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Vajna
A simpl
e
script to
p
ar
s
e the results from the testc
a
ses
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
g
it-
r
ebase -
i
: men
t
ion the short comman
d
alia
s
es in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos
V
ajna
Remove unuse
d
code in parse_commit_
b
u
f
fer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
S
t
r
buf
d
ocu
m
e
n
tation: d
o
cument
m
ost functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos
Vajna
Revisio
n
wa
l
king
d
ocument
a
tion: d
o
cument
most impor
t
ant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
Cod
i
ngGuidelines: Add a
n
ote
to a
v
oi
d
assig
n
ments
i
n
side
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-merg
e
:
ex
c
lude unnecessary option
s
fro
m
OPT
I
O
N
S_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos V
a
jna
git-fast-i
m
port: rename cmd_
*
(
)
functions to pars
e
_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
I
N
STALL: add a
n
ote abou
t
GN
U
int
e
ractive tools ha
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
Add
tes
t
s for se
n
dem
a
il
.
cc configur
a
tion varia
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Va
j
na
git-send-em
a
il: add a
new
s
endemail
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
l
os Vajna
g
it-format-patch: add a new
format
.
cc co
n
figurati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos
Vajna
git checkout: a
d
d
-t a
l
i
a
s
for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vaj
n
a
diff options documentation: re
f
er t
o
--diff-f
i
lter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
c
o
n
t
rib/hooks
:
ad
d
an
e
xample pre-a
u
t
o-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos V
a
jna
Doc
u
me
n
tation/hooks: add p
r
e-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
os Vajna
gi
t
-
g
c
-
-auto:
a
dd pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
Documentation/git-merg
e
: document s
u
bt
r
ee
s
t
ra
t
e
g
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Va
j
na
git-gui
:
Upda
t
ed
Hu
n
g
arian translatio
n
(e5
f
ba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Va
j
na
Update
Hungari
a
n
t
ranslatio
n
.
100% com
p
leted
.
commit
|
commitdiff
|
tree
2008-02-29
M
i
klos Vajn
a
Impro
v
e
t
6
029
t
o chec
k
t
he rea
l
"subtree"
case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Va
j
na
D
ocumentation/git svn log: add a not
e
a
b
out timez
o
nes
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
V
a
j
na
Documentation
/
git-
f
ilter-br
a
nch:
add
a
new
msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos V
a
jna
git-clean: hand
l
e errors if
r
emoving files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Document
a
tion/git-stas
h
: docume
n
t opt
i
ons for gi
t
stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s Vajna
git clone
-s docum
e
ntation: forc
e
a
n
ew
p
arag
r
aph
f
or
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Vajna
bui
l
tin-g
c
.
c
:
guard conf
i
g pars
e
r from
v
alu
e
=NUL
L
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mikl
o
s
V
ajna
gi
t
rev-parse manpage:
spellin
g
fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull manpage:
d
on't incl
u
de -n from f
e
tch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos V
a
jn
a
git
-
c
l
one
-s: document p
r
o
blems with git gc --pr
u
n
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Include rev-list opti
o
n
s
in
git-log
manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos
V
ajn
a
ls-remote: ad
d
-
t an
d
-h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Add using me
r
ge su
b
t
r
e
e How-T
o
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Va
j
na
t/t70
0
1: avoid unnece
s
sa
r
y ERE whe
n
using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-
s
h-setu
p
: d
o
cument
g
it_editor() an
d
g
e
t
_
author_ident_f
r
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
iklos Vajna
e
v
eryday:
r
e
p
lace 'prune'
a
nd 'repack
'
with 'gc
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian translation
.
100% complete
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vaj
n
a
I
n
c
l
ude diff options i
n
the git-lo
g
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklo
s
Va
j
na
git-sen
d
-emai
l
: add a new
s
endemail
.
to c
o
n
f
iguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mik
l
os Vajna
git stash: docu
m
e
nt
a
pply's --
i
nd
e
x
switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos Va
j
na
git-bundl
e
: f
i
x commandline examples
in the ma
n
page
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
kl
o
s Vaj
n
a
User Manual
:
add
a
chap
t
e
r for submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
M
i
k
los Va
j
na
Hungarian
t
ranslation
o
f
git
-
gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklo
s
Vajna
gitweb:
new
cgi
paramet
e
r: opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Mikl
o
s
V
ajna
gitweb
:
prefer git_get_project_
o
w
ner() over get_fil
e
_owne
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mik
l
os V
a
jna
Documen
t
-<n>
f
or git-fo
r
mat-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree