repo.or.cz
/
git
/
kirr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/maint-merge-recursive-r-d-conflict'
2009-01-07
Junio C Hamano
M
e
rge branc
h
'js/maint-merge-recurs
i
ve-r-d-c
o
nflict'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hamano
Merge b
r
anch 'mk/gitw
e
b-feature'
commit
|
commitdiff
|
tree
2009-01-07
Junio C
H
am
a
no
Merge branch 'cb/m
e
r
ge-recursi
v
e-fix'
commit
|
commitdiff
|
tree
2009-01-07
Junio C
H
amano
Merge branch 'kk/maint-http
-
push'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hamano
Me
r
ge branch 'm
v
/
um-
p
d
f
'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hama
n
o
Merge branch 'jn/gitweb-blame
'
commit
|
commitdiff
|
tree
2009-01-07
Junio C
Ha
m
ano
Merge br
a
n
c
h 'wp/add-p-go
t
o'
commit
|
commitdiff
|
tree
2009-01-07
R
e
né
Scharf
e
st
r
buf: i
n
st
a
te cle
a
nup rule in case of
n
o
n-memory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-07
J
u
n
io
C
H
a
m
a
no
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2009-01-07
Junio
C Haman
o
Me
r
ge
b
r
anch '
m
a
i
nt
-
1
.
6
.
0' i
n
to maint
commit
|
commitdiff
|
tree
2009-01-07
Jun
i
o
C
Hamano
Merge branc
h
'maint-1
.
5
.
6' into m
a
int-1
.
6
.
0
commit
|
commitdiff
|
tree
2009-01-07
Joey Hess
README
:
tutorial
.
txt is now called gitt
u
torial
.
t
x
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-06
Junio C H
a
mano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2009-01-05
Alexa
n
der P
o
t
ashev
r
emov
e
traili
n
g LF in die() m
e
ssages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-05
Henrik
A
u
s
tad
Be con
s
ist
e
n
t
i
n swit
c
h usage
for tar
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-05
H
enrik Austad
Use capitalized names where appropriat
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-05
SZE
D
ER Gábor
bash:
add '--merge' to
'
git r
e
set'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-05
J
o
hannes Schindelin
show <tag>: reuse
pp
_
user_info() ins
t
ea
d
of duplicating
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-05
Giuseppe
B
ilotta
gitweb: use href
(
)
w
hen
generatin
g
URLs in OP
M
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-03
Miklos
Vajna
fast-expor
t
:
p
r
int usage wh
e
n no options spe
c
ified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-03
Ju
n
io C Ha
m
ano
Merge
bran
c
h
'jc/maint-do-not-
s
witch-to-n
o
n-
c
ommit'
commit
|
commitdiff
|
tree
2009-01-03
Junio C Ha
m
a
n
o
Merge
branch 'ap/m
a
int
-
a
pply-modef
i
x'
commit
|
commitdiff
|
tree
2009-01-03
J
unio
C Hamano
git
c
hecko
u
t: do not allo
w
swi
t
ching to a tr
e
e-is
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-02
Juni
o
C Hamano
bui
l
tin
-
a
p
ply: preve
n
t no
n
-explicit
p
er
m
is
s
ion changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-02
Johannes Sc
h
in
d
elin
git wrapper: Mak
e
while
l
oo
p
mo
r
e
reader
-
friendly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-01
Junio
C Hamano
Mer
g
e branch 'cb/mergetool'
commit
|
commitdiff
|
tree
2009-01-01
Junio
C
Hamano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-01-01
jidanni@jidanni
.
org
Documen
t
ation/
g
it
-
tag
.
tx
t
: minor typo and
grammar
fi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-29
Junio C H
a
mano
Merge b
r
anc
h
'lt/
r
eset
-
merge'
commit
|
commitdiff
|
tree
2008-12-29
Junio C Hamano
M
e
rge br
a
nch 'n
p
/auto-thread'
commit
|
commitdiff
|
tree
2008-12-29
Junio
C Hamano
Merg
e
branch
'
m
a
int'
commit
|
commitdiff
|
tree
2008-12-29
J
u
nio C Hama
n
o
Prep
a
re for v1
.
6
.
1
.
1 maintenan
c
e
r
elease
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-29
jidanni@j
i
danni
.
org
Doc
u
menta
t
i
o
n
/diff-
o
ptions
.
t
x
t: u
n
ify options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-29
Teemu Likonen
Fix th
e
bui
l
ding of
g
i
t
man
.
info document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-29
Teemu Likonen
F
i
x t
h
e bui
l
ding of user-ma
n
ual
.
texi
and gitman
.
tex
i
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-28
Devin Doucette
gitw
e
b
:
Fix ex
p
o
r
t check in g
i
t_
g
et
_
p
r
oject
s
_
list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
Junio C Hamano
Merge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2008-12-27
Junio C Hamano
S
tart 1
.
6
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
Junio C H
a
ma
n
o
Merge b
r
anch 'rs/maint-tformat-foldline' into maint
commit
|
commitdiff
|
tree
2008-12-27
Ju
n
i
o
C Hamano
Me
r
ge branch '
r
s/mai
n
t-retval-fix' into maint
commit
|
commitdiff
|
tree
2008-12-27
Junio C Hamano
Merg
e
br
a
nch 'sp/maint-de
s
cribe-all-tag-w
a
rning' into
.
.
.
commit
|
commitdiff
|
tree
2008-12-27
Adeodato Simó
git-s
e
nd-emai
l
.
txt: move --f
o
rma
t
-patch par
a
g
r
a
ph to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
Adeodato Simó
git-shortlog
.
t
x
t: improve documentation about
.
mailmap
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
pretty:
s
upport
m
u
ltiline subjects
with form
a
t:
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
René S
c
ha
r
fe
p
retty: factor out f
o
r
ma
t
_
subje
c
t()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
Re
n
é Scharfe
pretty: fac
t
or out sk
i
p_emp
t
y
_
lines()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
merge
-
file:
h
andle freopen
(
) failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
R
ené Sch
a
rf
e
daemon
:
cleanup:
factor
o
ut xstrdu
p
_tolow
e
r()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
Ren
é
Scharfe
daemon: cleanu
p
: repl
a
ce
loop with if
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
daem
o
n: handle
f
reopen() fai
l
ure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
Shawn O
.
Pe
a
rc
e
descr
i
be: Avoid u
n
necessary
warning
when using
-
-
a
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-25
Johannes Schind
e
lin
m
e
rge-recursive: mar
k
rena
m
e/del
e
te
c
onflict as unm
e
r
g
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-25
Kirill A
.
Korinskiy
http-
p
ush: sup
p
ort full URI i
n
handle_remote_ls_
c
tx()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-25
Junio C Haman
o
G
I
T 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-24
Junio C Ha
m
an
o
M
e
rg
e
br
a
nch 'js/rebase-i-p'
commit
|
commitdiff
|
tree
2008-12-24
Johannes Schinde
l
in
r
e
base -i -p: leave a
-
-cc patch when a merge could
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t
9
129:
s
k
i
p
the last three tests i
f
U
TF-8
l
oc
a
le is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hamano
GIT 1
.
6
.
1-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Richard
Hartm
a
nn
Always show wh
i
ch directory
is
n
o
t a gi
t
repositor
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
R
i
c
har
d
Hartmann
M
a
ke help entries alpha
b
etical
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-22
Boyd Stephen Smith
Jr
git
-
revert d
o
cumentation: refer
to new HOWTO on
r
everting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Robin
R
osenberg
git-revert: rec
o
rd the parent
against which a revert
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Junio C H
a
m
a
n
o
Merge git:
/
/git
.
kernel
.
o
rg/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-21
Markus He
i
delbe
r
g
doc/git-fsck: change the way for getting heads
'
SHA1s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Marku
s
H
e
idelberg
Docum
e
ntation
/
g
it-show-
b
ranch: work around
"s
i
ngle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
J
unio
C
Hamano
send-email: futureproo
f
split_addrs() sub
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
J
unio C Hamano
Make
sur
e
lockfiles a
r
e unlocked
w
hen
dying on SIGPIPE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Ren
é
Scharf
e
fast-imp
o
rt
.
c: stricter strtoul c
h
eck, silence
c
o
m
pil
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
René Scharfe
c
o
nnect
.
c
: stric
t
er port valid
a
t
i
on, silenc
e
compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Nanako Shiraishi
Add a
documentat on how to revert a fau
l
ty m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
K
ir
i
ll A
.
Korin
s
ki
y
Remov
e
the requirement
opa
q
u
e
locktok
e
n u
r
i scheme
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Marcel M
.
Car
y
git-sh-setu
p
:
F
ix scripts whose PWD is a symlink into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes
S
ixt
rebas
e
-i
-p: F
i
x
--
c
o
n
tinue aft
e
r
a
merg
e
cou
l
d no
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
J
o
hannes
S
i
x
t
Show a failu
r
e of rebase -
p
if the merge ha
d
a
conf
l
ict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Hei
d
elberg
Doc
u
mentation
:
fix
t
ypos, gramm
a
r, asciidoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
Ham
a
no
Merge
br
a
nch 'mai
n
t
'
to syn
c
with GI
T
1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
H
amano
GIT
1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ham
a
no
fast-import: make tagge
r
information optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Johan
n
es S
c
hindelin
fast-e
x
po
r
t:
d
eal with
tag
objects
t
h
at
do not ha
v
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mik
l
os Vajna
Submittin
g
Patches: mention the usage
of real name in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
D
avid
A
gu
i
lar
git-mergetool: pr
o
p
e
rly hand
l
e "g
i
t
mergetool -- filename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengguang
git-s
e
nd-email: handle email add
r
ess with quoted comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mar
k
us Heidelberg
Documentation
:
fix typos, gr
a
mma
r
,
a
scii
d
oc synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Markus Heidelberg
Documentation: sync example output wit
h
g
it
output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René
S
c
h
arfe
Fix type
-
m
ismatch compi
l
e
r
warning from diff_populate_files
p
ec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Gruber
test overlapping ignore patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C
H
ama
n
o
M
erge branch 'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
Arjen
L
a
arhoven
Enable
t
hrea
d
ed delta
s
earch
on Mac OS X/Darwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shira
i
s
hi
Clarify
d
oc
u
mentation of "git che
c
ko
u
t
<
t
ree-ish> paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
M
er
g
e git://
r
epo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githo
o
ks documentation: add a not
e
ab
o
u
t the
+
x mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Hamano
combine-diff
.
c: us
e
strbuf_readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
uni
o
C
H
amano
b
uiltin-blam
e
.
c: use strbu
f
_
readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
n
io C Ha
m
ano
m
a
ke
_
absolute_path(
)
: check bounds when seein
g
an overlo
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Tor
v
ald
s
Make 'prepare_temp_file()
'
igno
r
e st_si
z
e f
o
r symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
n
us Torvalds
Mak
e
'dif
f
_po
p
ulate_filespec()'
u
se the new 's
t
rbuf_readlin
k
()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linu
s
Torvalds
Make 'index_pat
h
()' us
e
'strbuf_rea
d
link()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linu
s
T
o
rvald
s
Make 'ce_compar
e
_link()
'
us
e
the new 'strbuf_read
l
ink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Add
g
eneric 'strbuf_readlin
k
()' helper
f
unct
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next