summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t4213: avoid "|" in sed regexptr/remerge-diffJeff King2014-11-101-1/+3
* log --remerge-diff: show what the conflict resolution changedThomas Rast2014-09-087-2/+534
* name-hash: allow dir hashing even when !ignore_caseThomas Rast2014-09-082-5/+10
* merge-recursive: allow storing conflict hunks in indexThomas Rast2014-09-084-0/+30
* merge_diff_mode: fold all merge diff variants into an enumThomas Rast2014-09-0812-36/+44
* combine-diff: do not pass revs->dense_combined_merges redundantlyThomas Rast2014-09-086-18/+17
* merge-recursive: -Xindex-only to leave worktree unchangedThomas Rast2014-09-083-0/+19
* merge-recursive: internal flag to avoid touching the worktreeThomas Rast2014-09-082-16/+22
* merge-recursive: remove dead conditional in update_stages()Thomas Rast2014-09-081-4/+2
* Start the post-2.1 cycleJunio C Hamano2014-09-023-2/+54
* Merge branch 'rs/strbuf-getcwd'Junio C Hamano2014-09-0215-178/+191
|\
| * use strbuf_add_absolute_path() to add absolute pathsrs/strbuf-getcwdRené Scharfe2014-08-261-5/+1
| * abspath: convert absolute_path() to strbufRené Scharfe2014-08-264-42/+37
| * use xgetcwd() to set $GIT_DIRRené Scharfe2014-08-262-6/+6
| * use xgetcwd() to get the current directory or dieRené Scharfe2014-08-265-22/+26
| * wrapper: add xgetcwd()René Scharfe2014-08-262-0/+9
| * abspath: convert real_path_internal() to strbufRené Scharfe2014-08-261-44/+25
| * abspath: use strbuf_getcwd() to remember original working directoryRené Scharfe2014-08-261-4/+5
| * setup: convert setup_git_directory_gently_1 et al. to strbufRené Scharfe2014-08-261-43/+44
| * unix-sockets: use strbuf_getcwd()René Scharfe2014-07-281-7/+7
| * strbuf: add strbuf_getcwd()René Scharfe2014-07-283-0/+26
* | Merge branch 'ta/pretty-parse-config'Junio C Hamano2014-09-021-1/+3
|\ \
| * | pretty.c: make git_pretty_formats_config return -1 on git_config_string failureta/pretty-parse-configTanay Abhra2014-08-041-1/+3
* | | Merge branch 'bc/archive-pax-header-mode'Junio C Hamano2014-09-022-2/+7
|\ \ \
| * | | archive: honor tar.umask even for pax headersbc/archive-pax-header-modebrian m. carlson2014-08-042-2/+7
* | | | Merge branch 'pr/remotes-in-hashmap'Junio C Hamano2014-09-022-17/+49
|\ \ \ \
| * | | | use a hashmap to make remotes fasterpr/remotes-in-hashmapPatrick Reynolds2014-07-302-17/+49
* | | | | Merge branch 'jk/pretty-empty-format'Junio C Hamano2014-09-025-6/+14
|\ \ \ \ \
| * | | | | pretty: make empty userformats truly emptyjk/pretty-empty-formatJeff King2014-07-304-3/+11
| * | | | | pretty: treat "--format=" as an empty userformatJeff King2014-07-301-2/+2
| * | | | | revision: drop useless string offset when parsing "--pretty"Jeff King2014-07-301-1/+1
| |/ / / /
* | | | | Merge branch 'ta/config-set'Junio C Hamano2014-09-028-0/+801
|\ \ \ \ \
| * | | | | test-config: add tests for the config_set APITanay Abhra2014-07-294-0/+344
| * | | | | add `config_set` API for caching config-like filesTanay Abhra2014-07-294-0/+457
* | | | | | Merge branch 'rs/init-no-duplicate-real-path'Junio C Hamano2014-09-021-4/+4
|\ \ \ \ \ \
| * | | | | | init: avoid superfluous real_path() callsrs/init-no-duplicate-real-pathRené Scharfe2014-07-281-4/+4
* | | | | | | Merge branch 'mm/config-edit-global'Junio C Hamano2014-09-025-10/+69
|\ \ \ \ \ \ \
| * | | | | | | commit: advertise config --global --edit on guessed identitymm/config-edit-globalMatthieu Moy2014-07-251-2/+33
| * | | | | | | home_config_paths(): let the caller ignore xdg pathMatthieu Moy2014-07-251-4/+6
| * | | | | | | config --global --edit: create a template file if neededMatthieu Moy2014-07-253-4/+30
* | | | | | | | Merge branch 'jc/reopen-lock-file'Junio C Hamano2014-09-022-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | lockfile: allow reopening a closed but still locked filejc/reopen-lock-fileJunio C Hamano2014-07-142-0/+11
* | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-08-292-1359/+1515
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | po/TEAMS: add new members to German translation teamRalf Thielow2014-08-291-0/+2
| * | | | | | | | | l10n: de.po: translate 38 new messagesRalf Thielow2014-08-291-1359/+1513
* | | | | | | | | | Merge branch 'jk/diff-tree-t-fix'Junio C Hamano2014-08-262-1/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fixJeff King2014-08-202-1/+45
* | | | | | | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2014-08-262-0/+40
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmapJeff King2014-08-122-0/+40
* | | | | | | | | | | | Merge branch 'jk/fix-profile-feedback-build'Junio C Hamano2014-08-261-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status