repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: mark rename/delete conflict as unmerged
2008-12-25
Joh
a
n
nes Schindeli
n
merge-
r
ec
u
rsive
:
mark
rena
m
e/delete conf
l
ict as
u
nmerge
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-25
Junio C Hamano
GIT 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-24
Junio C Ha
m
a
n
o
Merge branch 'js/rebase-i-p'
commit
|
commitdiff
|
tree
2008-12-24
J
ohannes S
c
h
in
d
elin
rebase -
i
-
p: leave a --cc patch when a me
r
ge could
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Miklos
V
ajna
t9129: skip the last three tests if UTF-8 locale 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
R
i
ch
a
rd H
a
rtmann
A
lways show w
h
ich 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
Richard H
a
rt
m
ann
Ma
k
e he
l
p
e
n
tri
e
s alp
h
abet
i
ca
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
J
u
nio C Hama
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-12-22
B
o
yd Stephen Smith
J
r
git-revert docum
e
ntatio
n
: refer to ne
w
HO
W
TO on r
e
v
ert
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Robin
Rosenbe
r
g
g
i
t-revert: re
c
or
d
the pare
n
t
against which
a revert
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Jun
i
o C Haman
o
Merg
e
git://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-21
M
a
rku
s
Heidelberg
doc/git-fsck: chang
e
t
h
e way for getting heads' SHA1s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Marku
s
Heidelberg
Docum
e
nta
t
ion/git-show-branch: work around "singl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
J
u
nio C
H
amano
send-
e
m
ail: futureproof sp
l
i
t
_
a
ddrs()
sub
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Junio C Hamano
M
ake su
r
e lockfiles are unlocked when d
y
ing on SIGPIPE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
René
S
cha
r
fe
f
a
s
t-import
.
c: stricter
s
trtou
l
check, silence compile
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
René Scharf
e
connect
.
c: s
t
r
icte
r
port v
a
lidation, silence compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Nanako Shira
i
shi
Add a d
o
c
umentat on how to revert a
f
aulty me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Ki
r
ill A
.
K
o
rinskiy
Remove the requ
i
remen
t
o
p
aquelo
c
ktoken u
r
i sch
e
me
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Marcel M
.
Cary
git-sh
-
setu
p
:
F
ix s
c
rip
t
s whose PWD is a symlink int
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
rebase -i
-
p
:
Fix --continue afte
r
a me
r
ge
c
ou
l
d not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
S
how a failure
of reb
a
se
-
p
if the merge had a
co
n
flict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mark
u
s Heidelberg
Documen
t
a
t
ion: f
i
x
typos, grammar, as
c
iidoc sy
n
tax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ha
m
a
no
M
e
rge branch
'ma
i
nt' to syn
c
with GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
u
nio C H
a
m
a
no
GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Juni
o
C Hamano
fas
t
-imp
o
rt: make tagger i
n
formation optiona
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Joha
n
nes Schindelin
fa
s
t
-export
:
dea
l
wi
t
h tag o
b
ject
s
that do not h
a
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
M
i
klos Vaj
n
a
SubmittingPatches: mention the
us
a
ge
o
f real name in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id Aguil
a
r
git-mergetool
:
p
r
ope
r
ly
h
andle "gi
t
me
r
getool -- filename
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
W
u
F
e
nggu
a
ng
git-se
n
d-
e
mail: handle email ad
d
ress
w
i
t
h quoted comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
M
a
rkus Heid
e
lbe
r
g
D
ocument
a
tion:
f
ix typos, grammar, asciidoc
s
yntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Markus Heidelb
e
r
g
Docum
e
n
tatio
n
: sync ex
a
mple ou
t
put with git output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René S
c
har
f
e
F
ix type-mis
m
atch com
p
iler warn
i
ng
f
rom
d
i
ff_popul
a
te_files
p
ec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Michael
J
Gr
u
ber
test overlap
p
ing ignore patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Jun
i
o C
H
amano
Merge
bra
n
ch 'lt/read
l
ink'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarhoven
Enable threaded
d
elt
a
search on Mac OS X/Darwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nana
k
o
Shir
a
ishi
Clarify
documentation of "git checkout <t
r
e
e
-ish> p
a
ths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Ju
n
i
o C
H
aman
o
M
e
rge git://
r
epo
.
or
.
c
z/git
-
gui
commit
|
commitdiff
|
tree
2008-12-17
M
i
klo
s
V
ajna
githooks document
a
tion
:
a
dd a note abou
t
the
+x mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
H
aman
o
comb
i
ne-diff
.
c: use strbuf_readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Hama
n
o
builtin-b
l
ame
.
c:
use str
b
uf_r
e
adlin
k
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Ham
a
no
m
ake_abso
l
ute_path():
check bound
s
when seeing an overlong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus
Torvalds
M
ake 'prepare_temp_file()' ignore s
t
_size for symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make
'
d
iff_pop
u
late
_
filespec()' use the
n
e
w 'strbu
f
_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
u
s
Torva
l
ds
Make 'index_
p
ath(
)
' use
'strbuf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'ce_
c
ompare_link()' use the new
'
s
t
rb
u
f_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us Torvalds
Add gener
i
c
'st
r
buf_
r
eadli
n
k()' help
e
r function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus Hei
d
elberg
do
c
/git-rese
t
: add reference to git
-
stash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus He
i
del
b
erg
Documenta
t
ion: fix descr
i
ption for en
a
b
l
ing h
o
oks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os
V
aj
n
a
git-daemon documentat
i
on: use {ti
l
de}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Ham
a
no
gitweb
:
do not run "git diff" th
a
t is Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Hamano
GIT 1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Hamano
GIT 1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
GIT 1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ham
a
no
gi
t
we
b
: do
not run
"
gi
t
diff" that is Po
r
ce
l
ain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlo
w
b
ash comple
t
ion:
S
y
n
c
c
onfi
g
va
r
iables with th
e
i
r
man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee
Mar
l
ow
bash complet
i
on
:
Sort config compl
e
tion variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-16
Joh
a
nn
e
s Schi
n
delin
fast-imp
o
r
t
:
close pack
be
f
ore unlinking
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
unio C Hamano
pager:
d
o not d
u
p
2
std
e
rr if it is alread
y
redirected
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
u
ni
o
C H
a
mano
git-show:
do not segfau
l
t wh
e
n
s
howi
n
g a
b
ad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schind
e
l
i
n
Get ri
d
of the last remnant
s
of
GIT
_
CONFIG_L
O
CAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Alexander
G
avrilov
Documentation: D
e
scribe git-gui Tools menu
configuratio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONETAN
I
Tom
o
kazu
git-fast-import possible m
e
m
o
r
y corr
u
ption problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
M
arkus He
i
delberg
builtin-c
o
mmit: re
m
ove
u
nused
message variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jun
i
o C Ham
a
no
Merge
b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-13
B
r
andon Case
y
git-branch:
d
i
s
play sha1
on
branch deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim M
e
yering
git-
c
o
nfi
g
.
t
xt: fix a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jun
i
o C Hamano
M
e
r
ge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-11
Linu
s
Torvalds
fsc
k
: r
e
duce stack footpri
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
reb
a
se: improve error messag
e
s abou
t
dir
t
y sta
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nico
l
as Pitre
make sure packs to be replaced are clo
s
ed b
e
foreh
a
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexand
e
r Potashev
Fi
x
typo in comment in builti
n
-add
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio
C Hamano
Fi
x
t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Jef
f
Ki
n
g
d
i
ff:
respect textco
n
v in rewrite diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
d
i
f
f:
f
ix
han
d
lin
g
of binar
y
rewrite diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Al
e
xande
r
Po
t
ashev
F
i
x ty
p
os in documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid Lund
git-p4: Fix reg
r
ession in p4Where method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhues
Improve
l
a
n
guage in gi
t
-merg
e
.
t
x
t and rel
a
ted docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio
C
Ham
a
no
work a
r
ound Python
w
arn
i
ngs from As
c
i
i
Doc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Al
e
xey Borzenkov
Define
l
ink
g
i
t
macro in
[macros] se
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Mi
l
ler
g
i
t-
s
vn: Make follow
i
ng
parents atomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Na
r
ebski
gitweb: Fi
x
bug
in insert_file
(
) subrouti
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Ki
n
g
diff
:
a
l
lo
w
turning on tex
t
conv explicitly fo
r
plumbi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
r
e
order ALLOW_TEXTCO
N
V option setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
unio C
Hamano
read-cache
.
c: typof
i
x in com
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
H
amano
builtin-checkout
.
c: check e
r
ror return from read_cache()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C Hamano
P
o
in
t
"
s
tale" 1
.
6
.
0
.
5
d
ocument
a
t
ion from the
main
g
it
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
Revert
"g
i
t-stash:
u
se git
r
ev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o
C Hamano
Update draft release not
e
s
for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Junio C
H
amano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-07
Junio C H
a
mano
GIT 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Matt McC
u
tchen
"git diff
<
tree>{
3
,}
"
: do not reverse o
r
der of arguments
commit
|
commitdiff
|
tree
2008-12-07
J
e
f
f
Ki
n
g
tag: delete
T
AG_EDITMSG only on
succes
s
fu
l
tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Ja
k
ub Nar
e
bski
gitweb: Make proj
e
ct
specific over
r
i
d
e
f
o
r 'grep
'
feature
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos V
a
jna
ht
t
p
.
c:
use
'
g
it_co
n
fig_string' to get 'curl
_
http
_
p
roxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Tho
m
as
Rast
fetch-
p
ack: Avoid
memcpy() with
src==dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Ham
a
n
o
Update draft
r
el
e
a
s
e notes to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next