summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* reset $sha1 $pathspec: require $sha1 only to be treeishMartin von Zweigbergk2013-01-152-21/+35
* reset.c: inline update_index_refresh()Martin von Zweigbergk2013-01-151-9/+5
* reset.c: finish entire cmd_reset() whether or not pathspec is givenMartin von Zweigbergk2013-01-151-24/+18
* reset [--mixed]: only write index file onceMartin von Zweigbergk2013-01-151-9/+5
* reset.c: move lock, write and commit out of update_index_refresh()Martin von Zweigbergk2013-01-151-16/+18
* reset.c: move update_index_refresh() call out of read_from_tree()Martin von Zweigbergk2013-01-151-9/+9
* reset.c: replace switch by if-elseMartin von Zweigbergk2013-01-151-10/+3
* reset: avoid redundant error messageMartin von Zweigbergk2013-01-151-5/+3
* reset --keep: only write index file onceMartin von Zweigbergk2013-01-151-11/+10
* reset.c: share call to die_if_unmerged_cache()Martin von Zweigbergk2013-01-151-8/+6
* reset.c: extract function for updating {ORIG_,}HEADMartin von Zweigbergk2013-01-151-16/+23
* reset.c: remove unnecessary variable 'i'Martin von Zweigbergk2013-01-151-17/+16
* reset.c: extract function for parsing argumentsMartin von Zweigbergk2013-01-151-32/+38
* reset: don't allow "git reset -- $pathspec" in bare repoMartin von Zweigbergk2013-01-151-2/+4
* reset.c: pass pathspec around instead of (prefix, argv) pairMartin von Zweigbergk2013-01-151-17/+10
* reset $pathspec: exit with code 0 if successfulMartin von Zweigbergk2013-01-153-12/+16
* reset $pathspec: no need to discard indexMartin von Zweigbergk2013-01-151-15/+1
* Update draft release notes to 1.8.2Junio C Hamano2013-01-091-11/+53
* Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2013-01-091-242/+242
|\
| * l10n: de.po: address the user formallyRalf Thielow2013-01-071-242/+242
* | Merge branch 'nd/maint-branch-desc-doc'Junio C Hamano2013-01-094-14/+72
|\ \
| * | format-patch: pick up branch description when no ref is specifiedNguyễn Thái Ngọc Duy2013-01-032-3/+23
| * | format-patch: pick up correct branch name from symbolic refNguyễn Thái Ngọc Duy2013-01-032-12/+23
| * | t4014: a few more tests on cover letter using branch descriptionNguyễn Thái Ngọc Duy2013-01-031-0/+21
| * | branch: delete branch description if it's emptyNguyễn Thái Ngọc Duy2013-01-031-1/+1
| * | config.txt: a few lines about branch.<name>.descriptionNguyễn Thái Ngọc Duy2013-01-011-0/+6
* | | Merge branch 'jk/enable-test-lint-by-default'Junio C Hamano2013-01-091-0/+1
|\ \ \
| * | | tests: turn on test-lint by defaultJeff King2013-01-031-0/+1
* | | | Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Junio C Hamano2013-01-092-2/+17
|\ \ \ \
| * | | | merge: Honor prepare-commit-msg return codeAntoine Pelisse2013-01-032-2/+17
* | | | | Merge branch 'fc/remote-bzr'Junio C Hamano2013-01-092-0/+868
|\ \ \ \ \
| * | | | | remote-bzr: detect local repositoriesFelipe Contreras2013-01-021-20/+28
| * | | | | remote-bzr: add support for older versions of bzrFelipe Contreras2013-01-021-5/+9
| * | | | | remote-bzr: add support to push special modesFelipe Contreras2013-01-021-17/+43
| * | | | | remote-bzr: add support for fecthing special modesFelipe Contreras2013-01-022-11/+59
| * | | | | remote-bzr: add simple testsFelipe Contreras2013-01-021-0/+111
| * | | | | remote-bzr: update working tree upon pushingFelipe Contreras2012-12-131-0/+2
| * | | | | remote-bzr: add support for remote repositoriesFelipe Contreras2012-11-281-2/+24
| * | | | | remote-bzr: add support for pushingFelipe Contreras2012-11-281-0/+295
| * | | | | Add new remote-bzr transport helperFelipe Contreras2012-11-281-0/+352
* | | | | | Merge branch 'jc/submittingpatches'Junio C Hamano2013-01-091-84/+91
|\ \ \ \ \ \
| * | | | | | SubmittingPatches: give list and maintainer addressesJunio C Hamano2013-01-021-2/+6
| * | | | | | SubmittingPatches: remove overlong checklistJunio C Hamano2013-01-021-76/+61
| * | | | | | SubmittingPatches: mention subsystems with dedicated repositoriesJunio C Hamano2013-01-011-0/+24
| * | | | | | SubmittingPatches: who am I and who cares?Junio C Hamano2013-01-011-8/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'os/gitweb-highlight-uncaptured'Junio C Hamano2013-01-091-1/+1
|\ \ \ \ \ \
| * | | | | | gitweb: fix error in sanitize when highlight is enabledOrgad Shaneh2013-01-011-1/+1
* | | | | | | Merge branch 'jn/less-reconfigure'Junio C Hamano2013-01-091-2/+8
|\ \ \ \ \ \ \
| * | | | | | | build: do not automatically reconfigure unless configure.ac changedJonathan Nieder2013-01-021-2/+8
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'er/python-version-requirements'Junio C Hamano2013-01-098-3/+44
|\ \ \ \ \ \ \