aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of git://github.com/ralfth/git-po-deJiang Xin2013-01-25
|\
| * l10n: de.po: fix some minor issuesRalf Thielow2013-01-23
* | l10n: Update git.pot (11 new, 7 removed messages)Jiang Xin2013-01-25
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-01-23
|\ \
| * | gitk: Display important heads even when there are manyPaul Mackerras2013-01-02
| * | gitk: Improve display of list of nearby tags and headsPaul Mackerras2013-01-01
| * | gitk: Fix display of branch names on some commitsPaul Mackerras2013-01-01
| * | gitk: Update Swedish translation (296t)Peter Krefting2012-10-22
| * | gitk: When searching, only highlight files when in Patch modeStefan Haller2012-10-22
| * | gitk: Fix error message when clicking on a connecting lineStefan Haller2012-10-22
| * | gitk: Fix crash when not using themed widgetsMarcus Karlsson2012-10-22
| * | gitk: Use bindshiftfunctionkey to bind Shift-F5Andrew Wong2012-10-22
| * | gitk: Refactor code for binding modified function keysAndrew Wong2012-10-22
| * | gitk: Work around empty back and forward images when buttons are disabledStefan Haller2012-09-23
| * | gitk: Highlight first search result immediately on incremental searchStefan Haller2012-09-23
| * | gitk: Highlight current search hit in orangeStefan Haller2012-09-23
| * | gitk: Synchronize highlighting in file view when scrolling diffStefan Haller2012-09-23
* | | Merge branch 'jc/merge-blobs'Junio C Hamano2013-01-22
|\ \ \
| * | | Makefile: Replace merge-file.h with merge-blobs.h in LIB_HRamsay Jones2013-01-22
* | | | Update draft release notes to 1.8.2Junio C Hamano2013-01-22
* | | | Merge branch 'mz/reset-misc'Junio C Hamano2013-01-22
|\ \ \ \
| * | | | reset: update documentation to require only tree-ish with pathsMartin von Zweigbergk2013-01-16
| * | | | reset [--mixed]: use diff-based reset whether or not pathspec was givenMartin von Zweigbergk2013-01-15
| * | | | reset: allow reset on unborn branchMartin von Zweigbergk2013-01-15
| * | | | reset $sha1 $pathspec: require $sha1 only to be treeishMartin von Zweigbergk2013-01-15
| * | | | reset.c: inline update_index_refresh()Martin von Zweigbergk2013-01-15
| * | | | reset.c: finish entire cmd_reset() whether or not pathspec is givenMartin von Zweigbergk2013-01-15
| * | | | reset [--mixed]: only write index file onceMartin von Zweigbergk2013-01-15
| * | | | reset.c: move lock, write and commit out of update_index_refresh()Martin von Zweigbergk2013-01-15
| * | | | reset.c: move update_index_refresh() call out of read_from_tree()Martin von Zweigbergk2013-01-15
| * | | | reset.c: replace switch by if-elseMartin von Zweigbergk2013-01-15
| * | | | reset: avoid redundant error messageMartin von Zweigbergk2013-01-15
| * | | | reset --keep: only write index file onceMartin von Zweigbergk2013-01-15
| * | | | reset.c: share call to die_if_unmerged_cache()Martin von Zweigbergk2013-01-15
| * | | | reset.c: extract function for updating {ORIG_,}HEADMartin von Zweigbergk2013-01-15
| * | | | reset.c: remove unnecessary variable 'i'Martin von Zweigbergk2013-01-15
| * | | | reset.c: extract function for parsing argumentsMartin von Zweigbergk2013-01-15
| * | | | reset: don't allow "git reset -- $pathspec" in bare repoMartin von Zweigbergk2013-01-15
| * | | | reset.c: pass pathspec around instead of (prefix, argv) pairMartin von Zweigbergk2013-01-15
| * | | | reset $pathspec: exit with code 0 if successfulMartin von Zweigbergk2013-01-15
| * | | | reset $pathspec: no need to discard indexMartin von Zweigbergk2013-01-15
* | | | | Merge branch 'nd/fix-directory-attrs-off-by-one'Junio C Hamano2013-01-22
|\ \ \ \ \
| * | | | | attr: avoid calling find_basename() twice per pathDuy Nguyen2013-01-16
| * | | | | attr: fix off-by-one directory component length calculationNguyễn Thái Ngọc Duy2013-01-15
* | | | | | Merge branch 'pw/p4-branch-fixes'Junio C Hamano2013-01-21
|\ \ \ \ \ \
| * | | | | | git p4: fix submit when no master branchPete Wyckoff2013-01-15
| * | | | | | git p4 test: keep P4CLIENT changes inside subshellsPete Wyckoff2013-01-15
| * | | | | | git p4: fix sync --branch when no master branchPete Wyckoff2013-01-15
| * | | | | | git p4: fail gracefully on sync with no master branchPete Wyckoff2013-01-15
| * | | | | | git p4: rearrange self.initialParent usePete Wyckoff2013-01-15