repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase: Support preserving merges in non-interactive mode
2008-09-30
Andreas E
r
i
c
sson
r
e
base: Suppor
t
preserving merg
e
s
i
n non-i
n
t
era
c
t
i
ve
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Shawn O
.
Pearce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-30
L
uc
Heinr
i
ch
git-
s
v
n
: call
'
f
ata
l
' correctly in set-tree
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Michae
l
Prokop
R
e
p
lace svn
.
f
oo
.
o
rg w
i
th svn
.
example
.
co
m
in
git
-
svn
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Br
a
ndo
n
Ca
s
ey
diff
.
c: remove duplica
t
e bibtex pattern introd
u
ced
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
David Br
y
son
Use "git_config_string" to s
i
mplify
"
built
i
n
-
gc
.
c"
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
J
e
f
f
King
tests
:
g
r
ep
p
ort
a
bili
t
y
f
ixes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Jon
a
than del
St
r
other
Add OS X support
t
o the pre-auto-gc ex
a
mpl
e
hook
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
S
Z
EDER Gábor
t0024: add executable permiss
i
on
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Ralf Wildenhues
C
orrect
typos in
RelNotes-1
.
6
.
1
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
SZEDER Gábor
remove
vim
syntax highlighting
i
n
f
av
o
r of upstream
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Shaw
n
O
.
Pearce
Merge branch 'bc
/
m
a
ste
r
-
d
iff-hunk-header-fix'
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
P
e
a
rce
Me
r
ge branch 'mai
n
t' into b
c
/ma
s
ter-diff-
h
unk-header-fix
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearce
M
erge branch 'b
c
/maint-d
i
ff-hunk
-
header-fi
x
' into ma
i
nt
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
P
e
arce
M
e
r
ge branch 'jc/better-conflict-res
o
lution'
commit
|
commitdiff
|
tree
2008-09-29
Sha
w
n O
.
P
e
arce
Me
r
ge branch 'mg/m
a
i
nt-remote-fix' i
n
t
o maint
commit
|
commitdiff
|
tree
2008-09-29
Nanak
o
Shi
r
aishi
Add contrib/rer
e
re-trai
n
s
c
ript
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
R
afael Garcia-Suar
e
z
Clarify commit error message for un
m
erged fil
e
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
J
o
han Herland
Use
s
trchrnul() instead of strch
r
() plus manual workar
o
und
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Dmitr
y
Potapov
mi
n
gw: remo
v
e
use of _getdr
i
ve()
f
rom
lsta
t
/fstat
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
A
l
ex Riesen
Use rem
o
ve_path
f
rom
d
ir
.
c instead of own
i
mpl
e
mentation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Alex
R
iesen
Add
r
e
m
ove_path:
a fu
n
ction to remove as
m
u
c
h as possible
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Ping Yi
n
git-submodule: Fix "Unable to checkou
t
" for the initial
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Joha
n
nes Sixt
compat/mingw: Support a ti
m
eout in the
p
oll emulation
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
S
tephen Haber
m
an
Clarify how
t
h
e
us
e
r can sati
s
fy stash's 'dirty st
a
te
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-29
Nanako Shiraishi
usage
.
c
: remove un
u
sed funct
i
o
n
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Shaw
n
O
.
Pe
a
rce
M
e
r
ge branch
'm
a
int
'
commit
|
commitdiff
|
tree
2008-09-26
Alex
Riesen
Clea
n
up remove_path
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Al
e
x Riesen
Remove emp
t
y dire
c
t
ories in r
e
cursive merge
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Chris Frey
D
ocu
m
e
ntatio
n
: clarify the de
t
ail
s
of
overrid
i
ng LE
S
S
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Mer
g
e branc
h
'mv/
m
erge-
r
ecursiv
e
'
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pearce
Merge branch
'jc/altern
a
te-push'
commit
|
commitdiff
|
tree
2008-09-25
S
hawn
O
.
P
e
arce
M
erge branch
'
am/statu
s
'
commit
|
commitdiff
|
tree
2008-09-25
S
hawn O
.
Pearce
Merge branc
h
'pb/autocorrect-wrapper'
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pearce
Merge branch 'mv/commit-
t
ree'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge branch 'jc
/
ap
p
ly
-
inc
l
u
d
e-
e
xcl
u
de'
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn
O
.
P
earce
Merge b
r
anch '
j
c/safe-c-l-d'
commit
|
commitdiff
|
tree
2008-09-25
Giuseppe Bilot
t
a
gitweb: shortlog no
w
a
l
so obeys
$
has
h
_parent
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Mer
g
e br
a
nch 'h
o
/dirstat-by-f
i
le'
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn O
.
Pearc
e
Merge
git://rep
o
.
or
.
cz
/
git-
g
ui
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
P
e
arce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
P
e
a
rce
Upd
a
te release
n
otes
for 1
.
6
.
0
.
3
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Johan Herland
F
i
x s
u
bmodule sync
with relative
s
ubm
o
du
l
e URLs
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Na
n
a
k
o Shiraishi
graph
.
c: make man
y
functions
stat
i
c
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
N
a
nako Shiraishi
remote
.
c:
make free_r
e
f(), p
a
rse_push_ref
s
pec() and
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Jonas Fonseca
checkout:
Do not
show l
o
cal changes w
h
en in
quiet mode
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-25
Joh
a
n
Her
l
and
for-e
a
ch-ref: Fix --format=
%
(subject) f
o
r log
m
essage
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
P
etr
Baudis
git-web--
b
rowse: Support for using /bin/start on MinGW
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexa
n
der Gavr
i
lo
v
git-gui
:
Reenable staging
unmerge
d
fi
l
es by c
l
icking
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexand
e
r
Gavrilov
git-gui: Support t
h
e encoding m
e
n
u
in gui blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavril
o
v
git-gu
i
: Optim
i
ze e
n
c
o
ding
n
ame resolution using a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
l
exand
e
r Gavrilov
git-g
u
i: Allow
f
or
c
ing display enc
o
ding fo
r
diffs usin
g
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
lex
a
nder Gavrilov
git-gui:
Add
a
me
n
u of avai
l
able enco
d
i
ngs
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Ale
x
ander Ga
v
rilov
g
i
t
-gui
:
C
leanup handling
of the defaul
t
e
nc
o
ding
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pe
a
rce
git-gui: Ass
u
me `blame --increm
e
ntal` ou
t
put is
in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
P
earce
git-gui:
U
se gi
t
attribute "encoding" for file content
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
J
o
s
hua W
i
lli
a
ms
git-
g
ui: A
d
d support for c
a
lling out to the prepare
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pea
r
ce
g
it-gui: Hi
d
e com
m
i
t
r
e
lated UI dur
i
ng citool
-
-no
c
ommit
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
lexander Gavrilov
git-gui:
A
dd mo
r
e in
t
e
g
rat
i
on options
t
o
cit
o
ol
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
B
r
ando
n
Casey
git
-
sta
s
h
.
sh:
don't default t
o
refs/
s
t
ash if in
v
alid
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Garr
y
Dolle
y
Fixed some grammati
c
al errors in git-rebase
.
txt document
a
tion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Deskin Mi
l
ler
maint:
c
heck re
t
urn of split_cmdline to
a
void b
a
d conf
i
g
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-13
Chri
s
tian St
i
m
ming
git
-
gu
i
: Updated G
e
r
m
a
n translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-12
Christian Stimm
i
n
g
git-gui: I18n fix
s
entence p
a
rts int
o
full sentences
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexander Gavrilov
git-
g
ui:
R
e
s
tore abi
l
i
ty to S
t
age Working
Copy
for
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexander Gavrilov
git-gui: Fix Blame Par
e
nt & Co
n
te
x
t
for working copy
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pearce
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-09-05
Sh
a
wn O
.
Pe
a
r
c
e
git-gui:
Fix diff p
a
rsing for lines st
a
r
t
ing with
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alex
a
nd
e
r Ga
v
rilov
git-gui:
Show speci
a
l di
f
fs
for complex conflict cases
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexa
n
der Gavrilov
gi
t
-g
u
i:
Make F5 reselect a diff, if a
n
untracked file
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavr
i
lov
git-gui: Reimp
l
em
e
nt and enhance auto-selec
t
i
o
n
o
f
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander
G
a
v
ri
l
ov
git-gui: Support
c
onfli
c
t st
a
tes
_
U & UT
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexan
d
er G
a
vr
i
l
o
v
git-gui: Support more merge t
o
ol
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Ale
x
ander G
a
vrilov
g
it-gui: Don
'
t allow
st
a
gin
g
fil
e
s with conf
l
icts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander
G
avrilov
g
i
t-
g
ui: Support calling m
e
r
ge tools
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
l
e
xa
n
der Gavr
i
lov
git-gui:
Su
p
port
r
esolving con
f
lict
s
via
th
e
diff context
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Christian
S
timming
gi
t
-
gui
:
M
ark fo
r
gotten strings for translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-01
S
hawn O
.
Pearce
Merg
e
b
r
an
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-09-01
Alexande
r
Ga
v
rilov
git-
g
u
i
: F
i
x
strin
g
escaping in po2msg
.
sh
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-01
Clemens B
u
chacher
git gui: show diffs with a minimum
o
f 1 context line
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Alexander Ga
v
r
i
l
ov
git-
g
ui: All
o
w
speci
f
yin
g
an initi
a
l li
n
e for git
gui
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Alex
a
nder
G
a
v
rilov
g
i
t-gui:
B
et
t
er positioning
i
n
Blame Paren
t
Commit
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Alexander Gavrilov
git-gui: Support passing
b
lame to a parent
c
ommit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
Alexa
n
der Gavrilov
git-gui:
S
u
p
port
s
tar
t
ing
g
i
t
k from Gui Bla
m
e
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-25
G
ustaf Hendeby
git-gui: Teach
g
i
t gui about file type
c
hanges
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-13
Alexandre Bourget
git
-
g
u
i: update al
l
remaining translati
o
n
s
t
o
Fren
c
h
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-13
Alex
a
ndr
e
Bourget
g
it-
g
ui: Update french transla
t
i
on
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-10
Shaw
n
O
.
Pearce
git-gui 0
.
11
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-05
Johannes Si
x
t
g
it
-
gui: Adap
t
disc
o
v
e
ry of
o
gu
i
lib to execdir 'libexec
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-03
Miche
l
e B
a
l
labio
git-gui
:
a
d
d
a part abou
t
fo
r
m
a
t
stri
n
g
s
in po/READ
M
E
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-03
Michel
e
Ballabio
git
-
gu
i
: update po/it
.
p
o
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-03
しら
い
しななこ
g
i
t-gui: up
d
ate Japanese translation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
Mikael Magnusson
g
i
t-
g
ui: Upda
t
e swed
i
sh translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
Shawn O
.
Pearc
e
git-gui:
U
pdate git-gui
.
pot
f
or 0
.
11
nea
r
i
n
g
re
l
ease
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-08-02
Christian Stimming
git-
g
ui: Up
d
ate German transl
a
tion
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Steffen Prohaska
git-gui (Windows
)
:
Change
wrapper to e
x
ecdi
r
'l
i
bexe
c
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Steffen
Prohaska
git-
g
ui
(
Windows): Swit
c
h to rela
t
ive disco
v
ery of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Steff
e
n
Prohaska
git-
g
ui:
Correc
t
instal
l
atio
n
of library to be $
p
refix
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-30
Shawn O
.
Pearc
e
g
it-gui
:
Fix
gitk sea
r
ch
in $PATH to work o
n
Windows
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-07-27
Alexander
G
a
v
rilov
git-gui
:
Preserv
e
s
c
roll pos
i
tion
on resh
o
w_di
f
f
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next